[Piwik-svn] r480 - in trunk: modules modules/PluginsFunctions modules/SmartyPlugins plugins/Home/templates plugins/Installation plugins/Installation/lang

Thu May 15 03:48:18 CEST 2008

Author: matt
Date: 2008-05-15 03:48:17 +0200 (Thu, 15 May 2008)
New Revision: 480

Modified:
   trunk/modules/DataTable.php
   trunk/modules/PluginsFunctions/Menu.php
   trunk/modules/SmartyPlugins/modifier.translate.php
   trunk/plugins/Home/templates/index.tpl
   trunk/plugins/Installation/Installation.php
   trunk/plugins/Installation/lang/en.php
Log:
- fixing missing </title> tag > piwik was not working on IE!!
- fixing loadFromSimpleArray throws warning when trying to load an empty array
- clarifying error message PDO in installation

Modified: trunk/modules/DataTable.php
===================================================================

--- trunk/modules/DataTable.php	2008-05-11 20:48:54 UTC (rev 479)
+++ trunk/modules/DataTable.php	2008-05-15 01:48:17 UTC (rev 480)
@@ -720,7 +720,12 @@
 	 *		)
 	 */
 	public function loadFromSimpleArray( $array )
-	{		
+	{
+		if(count($array) === 0)
+		{
+			return;
+		}
+		
 		// we define an exception we may throw if at one point we notice that we cannot handle the data structure
 		$e = new Exception(" Data structure returned is not convertible in the requested format.".
 						" Try to call this method with the parameters '&format=original&serialize=1'".

Modified: trunk/modules/PluginsFunctions/Menu.php
===================================================================
--- trunk/modules/PluginsFunctions/Menu.php	2008-05-11 20:48:54 UTC (rev 479)
+++ trunk/modules/PluginsFunctions/Menu.php	2008-05-15 01:48:17 UTC (rev 480)
@@ -103,4 +103,4 @@
 {
 	global $menuEditsToApply;
 	$menuEditsToApply[] = array($mainMenuToEdit, $subMenuToEdit, $newUrl);
-}
+} 

Modified: trunk/modules/SmartyPlugins/modifier.translate.php
===================================================================
--- trunk/modules/SmartyPlugins/modifier.translate.php	2008-05-11 20:48:54 UTC (rev 479)
+++ trunk/modules/SmartyPlugins/modifier.translate.php	2008-05-15 01:48:17 UTC (rev 480)
@@ -31,3 +31,4 @@
 	}
 	return vsprintf(Piwik_Translate($string), $aValues);
 }
+ 
\ No newline at end of file

Modified: trunk/plugins/Home/templates/index.tpl
===================================================================
--- trunk/plugins/Home/templates/index.tpl	2008-05-11 20:48:54 UTC (rev 479)
+++ trunk/plugins/Home/templates/index.tpl	2008-05-15 01:48:17 UTC (rev 480)
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd ">
 <html>
 <head>
-<title>Piwik - Your Web Analytics Reports
+<title>Piwik - Your Web Analytics Reports</title>
 </head>
 <body>
 

Modified: trunk/plugins/Installation/Installation.php
===================================================================
--- trunk/plugins/Installation/Installation.php	2008-05-11 20:48:54 UTC (rev 479)
+++ trunk/plugins/Installation/Installation.php	2008-05-15 01:48:17 UTC (rev 480)
@@ -71,4 +71,4 @@
 		}
 		exit;
 	}	
-}
\ No newline at end of file
+}

Modified: trunk/plugins/Installation/lang/en.php
===================================================================
--- trunk/plugins/Installation/lang/en.php	2008-05-11 20:48:54 UTC (rev 479)
+++ trunk/plugins/Installation/lang/en.php	2008-05-15 01:48:17 UTC (rev 480)
@@ -19,7 +19,7 @@
 	'Installation_SystemCheckPhp' => 'PHP version',
 	'Installation_SystemCheckPdo' => 'Pdo extension',
 	'Installation_SystemCheckPdoMysql' => 'Pdo_Mysql extension',
-	'Installation_SystemCheckPdoError' => 'You need to enable the <code>php_pdo</code> and <code>php_pdo_mysql</code> extensions in your php.ini file.',
+	'Installation_SystemCheckPdoError' => 'You need to enable the PDO and PDO_MYSQL extensions in your php.ini file.',
 	'Installation_SystemCheckPdoHelp' => 'On a windows server you can add the following lines in your php.ini %s <br><br>On a Linux server you can compile php with the following option %s In your php.ini, add the following lines %s<br><br>More information on the <a style="color:red" href="http://php.net/pdo">PHP website</a>.',
 	'Installation_SystemCheckPhpXml' => 'PHP-XML extension',
 	'Installation_SystemCheckWriteDirs' => 'Directories with write access',

