Changeset 12920 for trunk/include/template.class.php

Timestamp:

Jan 17, 2012, 10:58:18 PM (12 years ago)

Author:

rvelices

Message:

feature 2548 multisize - code cleanup + better usage in category_cats + i.php logs memory usage peak

File:

• trunk/include/template.class.php (modified) (7 diffs)

trunk/include/template.class.php

@@ -23 +23 @@
 
 
-require_once(PHPWG_ROOT_PATH.'include/smarty/libs/Smarty.class.php');
-
-
 class Template {
 
@@ -43 +40 @@
   // used by html_head smarty block to add content before </head>
   var $html_head_elements = array();
+  private $html_style = '';
 
   const COMBINED_SCRIPTS_TAG = '<!-- COMBINED_SCRIPTS -->';
@@ -113 +111 @@
     $this->smarty->register_modifier( 'get_extent', array(&$this, 'get_extent') );
     $this->smarty->register_block('html_head', array(&$this, 'block_html_head') );
+    $this->smarty->register_block('html_style', array(&$this, 'block_html_style') );
     $this->smarty->register_function('combine_script', array(&$this, 'func_combine_script') );
     $this->smarty->register_function('get_combined_scripts', array(&$this, 'func_get_combined_scripts') );
@@ -467 +466 @@
     }
 
-    if ( count($this->html_head_elements) )
+    if ( count($this->html_head_elements) || strlen($this->html_style) )
     {
       $search = "\n</head>";
@@ -473 +472 @@
       if ($pos !== false)
       {
-        $this->output = substr_replace( $this->output, "\n".implode( "\n", $this->html_head_elements ), $pos, 0 );
+        $rep = "\n".implode( "\n", $this->html_head_elements );
+        if (strlen($this->html_style))
+        {
+          $rep='<style type="text/css">'.$this->html_style.'</style>';
+        }
+        $this->output = substr_replace( $this->output, $rep, $pos, 0 );
       } //else maybe error or warning ?
       $this->html_head_elements = array();
+      $this->html_style = '';
     }
 
@@ -530 +535 @@
     { // second call
       $this->html_head_elements[] = $content;
+    }
+  }
+
+  function block_html_style($params, $content, &$smarty, &$repeat)
+  {
+    $content = trim($content);
+    if ( !empty($content) )
+    { // second call
+      $this->html_style .= $content;
     }
   }
@@ -843 +857 @@
     return call_user_func_array('sprintf',  $args );
   }
-  
+
   function derivative_url($type, $img)
   {