0
@@ -187,11 +187,11 @@ echo "<!-- CMS Made Simple - Released under the GPL - http://cmsmadesimple.org -
0
 
0
 //var_dump(CmsLogin::get_current_user());
0
 
0
-#if (CmsConfig::get('debug'))
0
-#{
0
+if (CmsConfig::get('debug'))
0
+{
0
   echo "<p>Generated in ".$endtime." seconds by CMS Made Simple using ".CmsDatabase::query_count()." SQL queries and " . $memory . " bytes of memory</p>";
0
   echo CmsProfiler::get_instance()->report();
0
-#}
0
+}
0
 
0
 if (get_site_preference('enablesitedownmessage') == "1" || $config['debug'] == true)
0
 {

0
@@ -92,16 +92,18 @@ class CmsPageInfo extends CmsObject
0
     
0
     $gCms = cmsms();
0
     $smarty = cms_smarty();
0
+		
0
+		$id = CmsRequest::get_id_from_request();
0
 
0
     #If this is a case where a module doesn't want a template to be shown, just disable caching
0
-		if (isset($smarty->id) && $smarty->id != '' && isset($_REQUEST[$smarty->id.'showtemplate']) && $_REQUEST[$smarty->id.'showtemplate'] == 'false')
0
+		if (isset($id) && $id != '' && isset($_REQUEST[$id.'showtemplate']) && ($_REQUEST[$id.'showtemplate'] == 'false' || $_REQUEST[$id.'showtemplate'] == false))
0
     {
0
       $html = $smarty->fetch('template:notemplate') . "\n";
0
     }
0
     else
0
     {
0
-			$smarty->caching = false;
0
-			$smarty->compile_check = true;
0
+			//$smarty->caching = false;
0
+			//$smarty->compile_check = true;
0
       ($smarty->is_cached('template:'.$this->template_id)?$cached="":$cached="not ");
0
       // Added HTTP_HOST here to work with multisites - SK
0
       $html = $smarty->fetch('template:'.$this->template_id.$_SERVER['HTTP_HOST']) . "\n";
0
@@ -113,18 +115,7 @@ class CmsPageInfo extends CmsObject
0
 
0
     if (!$cached)
0
     {
0
-			#Perform the content postrendernoncached callback
0
-			reset($gCms->modules);
0
-			while (list($key) = each($gCms->modules))
0
-			{
0
-				$value =& $gCms->modules[$key];
0
-				if ($gCms->modules[$key]['installed'] == true &&
0
-					$gCms->modules[$key]['active'] == true)
0
-				{
0
-					$gCms->modules[$key]['object']->ContentPostRenderNonCached($html);
0
-				}
0
-			}
0
-			//CmsEvents::send_event('Core', 'ContentPostRenderNonCached', array(&$html));
0
+			CmsEvents::send_event('Core', 'ContentPostRenderNonCached', array(&$html));
0
     }
0
 
0
     CmsEvents::send_event('Core', 'ContentPostRender', array('content' => &$html));

0
@@ -44,7 +44,6 @@ function smarty_cms_help_function_header() {
0
     <li><em>(optional)</em>name - Instead of getting all stylesheets for the given page, it will only get one spefically named one, whether it's attached to the current template or not.</li>
0
     <li><em>(optional)</em>media - If name is defined, this allows you set a different media type for that stylesheet.</li>
0
     <li><em>(optional)</em>showbase (true/false) - If set to false, the base tag will not be sent to the browser.  Defaults to true.</li>
0
-		<li><em>(optional)</em>assign - Assign the output to a smarty variable named in assign instead of outputting it directly.</li>
0
   </ul>
0
   <?php
0
 }

0
@@ -154,14 +154,7 @@ function cms_header_filter_plugin_function($params, &$smarty)
0
   
0
   CmsEventOperations::send_event('Core', 'HeaderTagRender', array('content' => &$result));
0
   
0
-	if (array_key_exists('assign', $params))
0
-	{
0
-		$smarty->assign($params['assign'], $result);
0
-	}
0
-	else
0
-	{
0
-		return $result;
0
-	}
0
+	return $result;
0
 }
0
 
0
 # vim:ts=4 sw=4 noet