diff options
| author | matt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2008-05-15 05:48:17 +0400 |
|---|---|---|
| committer | matt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2008-05-15 05:48:17 +0400 |
| commit | 21e89891f990639144358109c8e14cf3ca6af717 (patch) | |
| tree | 6140d6d4cf43f9dfcd6708c399feb7307e5487a0 | |
| parent | 9fd028348820402b4a3e40a50270c7cb7539cefd (diff) | |
- 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
| -rw-r--r-- | modules/DataTable.php | 7 | ||||
| -rw-r--r-- | modules/PluginsFunctions/Menu.php | 2 | ||||
| -rw-r--r-- | modules/SmartyPlugins/modifier.translate.php | 1 | ||||
| -rw-r--r-- | plugins/Home/templates/index.tpl | 2 | ||||
| -rw-r--r-- | plugins/Installation/Installation.php | 2 | ||||
| -rw-r--r-- | plugins/Installation/lang/en.php | 2 |
6 files changed, 11 insertions, 5 deletions
diff --git a/modules/DataTable.php b/modules/DataTable.php index 5af22f1175..fea3f2da39 100644 --- a/modules/DataTable.php +++ b/modules/DataTable.php @@ -720,7 +720,12 @@ class Piwik_DataTable * ) */ 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'". diff --git a/modules/PluginsFunctions/Menu.php b/modules/PluginsFunctions/Menu.php index 9fc301be51..740aef6c09 100644 --- a/modules/PluginsFunctions/Menu.php +++ b/modules/PluginsFunctions/Menu.php @@ -103,4 +103,4 @@ function Piwik_EditMenuUrl( $mainMenuToEdit, $subMenuToEdit, $newUrl ) {
global $menuEditsToApply;
$menuEditsToApply[] = array($mainMenuToEdit, $subMenuToEdit, $newUrl);
-} +} diff --git a/modules/SmartyPlugins/modifier.translate.php b/modules/SmartyPlugins/modifier.translate.php index e05b527ba2..e62b487e11 100644 --- a/modules/SmartyPlugins/modifier.translate.php +++ b/modules/SmartyPlugins/modifier.translate.php @@ -31,3 +31,4 @@ function smarty_modifier_translate($string) }
return vsprintf(Piwik_Translate($string), $aValues);
} +
\ No newline at end of file diff --git a/plugins/Home/templates/index.tpl b/plugins/Home/templates/index.tpl index 5b89283281..5802998066 100644 --- a/plugins/Home/templates/index.tpl +++ b/plugins/Home/templates/index.tpl @@ -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>
diff --git a/plugins/Installation/Installation.php b/plugins/Installation/Installation.php index 26478cffcf..ebd0f9cd75 100644 --- a/plugins/Installation/Installation.php +++ b/plugins/Installation/Installation.php @@ -71,4 +71,4 @@ class Piwik_Installation extends Piwik_Plugin }
exit;
}
-}
\ No newline at end of file +} diff --git a/plugins/Installation/lang/en.php b/plugins/Installation/lang/en.php index 74205642d3..0db84b703a 100644 --- a/plugins/Installation/lang/en.php +++ b/plugins/Installation/lang/en.php @@ -19,7 +19,7 @@ $translations = array( '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',
|