diff options
| -rw-r--r-- | core/testMinimumPhpVersion.php | 4 | ||||
| -rw-r--r-- | plugins/CorePluginsAdmin/PluginInstaller.php | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/core/testMinimumPhpVersion.php b/core/testMinimumPhpVersion.php index 532b68153c..ce64bb44f1 100644 --- a/core/testMinimumPhpVersion.php +++ b/core/testMinimumPhpVersion.php @@ -76,7 +76,9 @@ if (!function_exists('Piwik_ExitWithMessage')) { */ function Piwik_ShouldPrintBackTraceWithMessage() { - return defined('PIWIK_PRINT_ERROR_BACKTRACE') || defined('PIWIK_TRACKER_DEBUG'); + $bool = (defined('PIWIK_PRINT_ERROR_BACKTRACE') && PIWIK_PRINT_ERROR_BACKTRACE) + || (defined('PIWIK_TRACKER_DEBUG') && PIWIK_TRACKER_DEBUG); + return $bool; } /** diff --git a/plugins/CorePluginsAdmin/PluginInstaller.php b/plugins/CorePluginsAdmin/PluginInstaller.php index 5f634f048e..d284ff75c8 100644 --- a/plugins/CorePluginsAdmin/PluginInstaller.php +++ b/plugins/CorePluginsAdmin/PluginInstaller.php @@ -110,7 +110,7 @@ class PluginInstaller $this->removeFolderIfExists($pathExtracted); if (0 == ($pluginFiles = $archive->extract($pathExtracted))) { - throw new PluginInstallerException(Piwik_TranslateException('Plugin_ExceptionArchiveIncompatible', $archive->errorInfo())); + throw new PluginInstallerException(Piwik_TranslateException('CoreUpdater_ExceptionArchiveIncompatible', $archive->errorInfo())); } if (0 == count($pluginFiles)) { @@ -179,7 +179,7 @@ class PluginInstaller } if (empty($firstSubFolder)) { - throw new PluginInstallerException('The plugin ZIP file does not contain a subfolder.'); + throw new PluginInstallerException('The plugin ZIP file does not contain a subfolder, but Piwik expects plugin files to be within a subfolder in the Zip archive.'); } return $firstSubFolder; |