Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[32901] branches/proposals/6.x/lib

[Stephane C. <se...@lo...>]

Le Fri, Feb 18, 2011 at 04:14:36PM +0000, Jonny Bradley écrivait :
> +1
> 
> The smarty fix mended the create new user confirm issue, didn't know
> about the other accesslib one, but should fix things similarly, thanks
> Stéphane :)

You're welcome ! ;p

> On 18 Feb 2011, at 15:01, se...@us... wrote:
> 
> > Revision: 32901
> >          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=32901&view=rev
> > Author:   sept_7
> > Date:     2011-02-18 15:01:26 +0000 (Fri, 18 Feb 2011)
> > 
> > Log Message:
> > -----------
> > [FIX/bp 32900] Fix gzip issue when obzip is on and we are cleanning the output
> > buffer.  This should fix regressions in 32280 (trunk) and 32825 (proposals)...
> > 
> > Modified Paths:
> > --------------
> >    branches/proposals/6.x/lib/init/smarty.php
> >    branches/proposals/6.x/lib/tikiaccesslib.php
> > 
> > Modified: branches/proposals/6.x/lib/init/smarty.php
> > ===================================================================
> > --- branches/proposals/6.x/lib/init/smarty.php	2011-02-18 14:58:36 UTC (rev 32900)
> > +++ branches/proposals/6.x/lib/init/smarty.php	2011-02-18 15:01:26 UTC (rev 32901)
> > @@ -153,6 +153,9 @@
> > 			}
> > 		} elseif ($_smarty_tpl_file == 'confirm.tpl' || $_smarty_tpl_file == 'error.tpl' || $_smarty_tpl_file == 'error_ticket.tpl' || $_smarty_tpl_file == 'error_simple.tpl') {
> > 			ob_end_clean(); // Empty existing Output Buffer that may have been created in smarty before the call of this confirm / error* template
> > +			if ( $prefs['feature_obzip'] == 'y' ) {
> > +				ob_start('ob_gzhandler');
> > +			}
> > 
> > 			include_once('tiki-modules.php');
> > 
> > 
> > Modified: branches/proposals/6.x/lib/tikiaccesslib.php
> > ===================================================================
> > --- branches/proposals/6.x/lib/tikiaccesslib.php	2011-02-18 14:58:36 UTC (rev 32900)
> > +++ branches/proposals/6.x/lib/tikiaccesslib.php	2011-02-18 15:01:26 UTC (rev 32901)
> > @@ -321,6 +321,9 @@
> > 			echo "<script>document.location.href='$url';</script>\n";
> > 		} else {
> > 			@ob_end_clean(); // clear output buffer
> > +			if ( $prefs['feature_obzip'] == 'y' ) {
> > +				@ob_start('ob_gzhandler');
> > +			}
> > 			header("HTTP/1.0 $code Found");
> > 			header( "Location: $url" );
> > 		}
> > 
> > 

A+
-- 
Stéphane Casset            LOGIDÉE sàrl       Se faire plaisir d'apprendre
1a, rue Pasteur        Tel : +33 388 23 69 77           ca...@lo...
F-67540 OSTWALD        Fax : +33 388 23 69 77           http://logidee.com