diff options
| author | mattpiwik <matthieu.aubry@gmail.com> | 2008-05-15 05:48:17 +0400 |
|---|---|---|
| committer | mattpiwik <matthieu.aubry@gmail.com> | 2008-05-15 05:48:17 +0400 |
| commit | 4f3ee099d01b555c4667b88525edb4cad6e4db65 (patch) | |
| tree | 6140d6d4cf43f9dfcd6708c399feb7307e5487a0 /modules | |
| parent | 1192a8bc5788d09cac521cce174b6c9b6fe8adc1 (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
git-svn-id: http://dev.piwik.org/svn/trunk@480 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/DataTable.php | 7 | ||||
| -rw-r--r-- | modules/PluginsFunctions/Menu.php | 2 | ||||
| -rw-r--r-- | modules/SmartyPlugins/modifier.translate.php | 1 |
3 files changed, 8 insertions, 2 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 |