[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squirrelmail-cvs
Subject:    [SM-CVS] CVS: squirrelmail/class/template template.class.php,1.11,1.12
From:       Marc Groot Koerkamp <stekkel () users ! sourceforge ! net>
Date:       2006-04-23 9:05:24
Message-ID: E1FXaWy-0002Ma-MZ () sc8-pr-cvs1 ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/squirrelmail/squirrelmail/class/template
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7968/class/template

Modified Files:
	template.class.php 
Log Message:
Do not use ob_end_flush because the fetch method returns the content of the
buffer. If we do not clear the buffer the to display template will be
displayed twice (paginator.tpl in this case)



Index: template.class.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/class/template/template.class.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- template.class.php	6 Apr 2006 19:49:28 -0000	1.11
+++ template.class.php	23 Apr 2006 09:05:22 -0000	1.12
@@ -222,9 +222,7 @@
    * @param string $file The template file to use
    * @return string A string of the results
    */
-  function fetch($file)
-  {
-    ob_start();
+  function fetch($file) {
     $t = &$this->values; // place values array directly in scope
 
     $template = in_array($file, $this->templates_provided) ? $this->template_dir . \
$file : SM_PATH .'templates/default/'. $file; @@ -234,10 +232,9 @@
         ob_start();
         include($template);
         $contents = ob_get_contents();
-        ob_end_flush();
+        ob_end_clean();
         return $contents;
     }
-
   }
 
   /**



-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
--
squirrelmail-cvs mailing list
List Address: squirrelmail-cvs@lists.sourceforge.net
List Info: https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
http://squirrelmail.org/cvs


[prev in list] [next in list] [prev in thread] [next in thread]