[Phpmyadmin-devel] Backport complete! please test...

[jeremy brand]

Patch to header.inc.php3 to only include ob_lib.inc.php3 _ONCE_!

I recomend finding out what is including ob_lib.inc.php3 more than once,
but if not, this patch will fix the problem.  I don't have the time to
test and install a tarball right now.

PS. hopefully this test code will get into cvs soon. :)

Jeremy

-- 
Jeremy Brand :: Sr. Software Engineer :: +393485323988 :: jeremy at nirvani.net
http://www.JeremyBrand.com/Jeremy/Brand/Jeremy_Brand.html for more
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    "LINUX is obsolete"  -- Andy Tanenbaum, January 29th, 1992
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  Get your own Free, Private email at http://www.smackdown.com/

On Thu, 26 Jul 2001, the following spilled from the mind of jeremy brand:

> Date: Thu, 26 Jul 2001 15:19:03 +0200 (WEDT)
> From: jeremy brand <jeremy at nirvani.net>
> Reply-To: phpmyadmin-devel at lists.sourceforge.net
> To: phpmyadmin-devel at lists.sourceforge.net
> Subject: RE: [Phpmyadmin-devel] Backport complete! please test...
>
>
> Is this code in CVS yet?
>
> Someone must be including header.inc.php3 twice!
>
> -- snip --
> jeremy at ROGUE ~/cvs-ro/phpMyAdmin
> $ egrep -inr "require|include" * | grep ob_lib
> header.inc.php3:5:require('./ob_lib.inc.php3');
>
> -- snip --
>
> > Oops,
> > Fatal error: Cannot redeclare out_buffer_mode_get() in
> > /web/htdocs/phpMyAdmin/loic/ob_lib.inc.php3 on line 15
> >
> > > -----Original Message-----
> > > http://phpmyadmin.sourceforge.net/phpMyAdmin-loic3.tar.gz
> >
> > Regards,
> >
> > --
> > Steve
> >
> >
> > _______________________________________________
> > Phpmyadmin-devel mailing list
> > Phpmyadmin-devel at lists.sourceforge.net
> > http://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel
> >
>
>
>
> _______________________________________________
> Phpmyadmin-devel mailing list
> Phpmyadmin-devel at lists.sourceforge.net
> http://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel
>
-------------- next part --------------
Index: header.inc.php3
===================================================================
RCS file: /cvsroot/phpmyadmin/phpMyAdmin/header.inc.php3,v
retrieving revision 1.10
diff -u -U6 -r1.10 header.inc.php3
--- header.inc.php3	2001/07/23 17:02:42	1.10
+++ header.inc.php3	2001/07/26 13:21:57
@@ -1,11 +1,12 @@
 <?php
 /* $Id: header.inc.php3,v 1.10 2001/07/23 17:02:42 lem9 Exp $ */
 
 require('./lib.inc.php3');
-require('./ob_lib.inc.php3');
+if (!defined('__OB_LIB_INC__'))
+  require('./ob_lib.inc.php3');
 
 if ($cfgOBGzip)
 {
 $ob_mode = out_buffer_mode_get();
 if ($ob_mode)
   out_buffer_pre($ob_mode);