[Piwik-svn] r189 - in trunk: config modules/DataTable/Renderer

[svnmaster at piwik.org]

Author: matt
Date: 2008-01-18 16:16:06 +0100 (Fri, 18 Jan 2008)
New Revision: 189

Modified:
   trunk/config/global.ini.php
   trunk/modules/DataTable/Renderer/Php.php
Log:
fix Infinite loop error

Modified: trunk/config/global.ini.php
===================================================================
--- trunk/config/global.ini.php	2008-01-18 14:41:44 UTC (rev 188)
+++ trunk/config/global.ini.php	2008-01-18 15:16:06 UTC (rev 189)
@@ -48,7 +48,7 @@
 [Debug]
 ; if set to true, the archiving process will always be triggered, even if the archive has already been computed
 ; this is useful when making changes to the archiving code so we can 
-always_archive_data = true
+always_archive_data = false
 
 [General]
 ; Time in seconds after which an archive will be computed again. 

Modified: trunk/modules/DataTable/Renderer/Php.php
===================================================================
--- trunk/modules/DataTable/Renderer/Php.php	2008-01-18 14:41:44 UTC (rev 188)
+++ trunk/modules/DataTable/Renderer/Php.php	2008-01-18 15:16:06 UTC (rev 189)
@@ -153,7 +153,7 @@
 		}
 		else
 		{
-			$array = $this->renderTable($this->table);
+			$array = $this->renderTable($this->table, $doRenderSubTablesIfAvailable = false);
 		}
 				
 		if($this->serialize)
@@ -167,7 +167,7 @@
 	protected $serialize;
 	
 	
-	protected function renderTable($table)
+	protected function renderTable($table, $doRenderSubTablesIfAvailable = false)
 	{
 		$array = array();
 
@@ -179,7 +179,8 @@
 				'idsubdatatable' => $row->getIdSubDataTable(),
 				);
 			
-			if($row->getIdSubDataTable() !== null)
+			if($doRenderSubTablesIfAvailable
+				&& $row->getIdSubDataTable() !== null)
 			{
 				try{
 					$subTable =  $this->renderTable( Piwik_DataTable_Manager::getInstance()->getTable($row->getIdSubDataTable()));