Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattpiwik <matthieu.aubry@gmail.com>2012-06-04 23:57:49 +0400
committermattpiwik <matthieu.aubry@gmail.com>2012-06-04 23:57:49 +0400
commitdb1dca3485ddd32b8d6b62e3fb503cc0bd173bb3 (patch)
treedeec1e5609856ace926e6a049e055aac91976ba9
parenta3384354e0bc469f2a7b1a79ece7ecb35c8335c3 (diff)
Must repackage with critical bug fix broken install... we really need webtests back ;)1.8.2
git-svn-id: http://dev.piwik.org/svn/trunk@6467 59fd770c-687e-43c8-a1e3-f5a4ff64c105
-rw-r--r--core/Version.php2
-rw-r--r--lang/en.php2
-rw-r--r--plugins/Installation/FormDatabaseSetup.php6
3 files changed, 7 insertions, 3 deletions
diff --git a/core/Version.php b/core/Version.php
index 9176abc0f9..f82fc394c6 100644
--- a/core/Version.php
+++ b/core/Version.php
@@ -21,5 +21,5 @@ final class Piwik_Version
* Current Piwik version
* @var string
*/
- const VERSION = '1.8.1';
+ const VERSION = '1.8.2';
}
diff --git a/lang/en.php b/lang/en.php
index 1860eba6ab..6f5ece8866 100644
--- a/lang/en.php
+++ b/lang/en.php
@@ -879,7 +879,7 @@ $translations = array(
'Installation_InsufficientPrivilegesHelp' => 'You can add these privileges by using a tool such as phpMyAdmin or by executing the right SQL queries. If you don\'t know how to do these things, please ask your sysadmin to grant these privileges for you.',
'LanguagesManager_PluginDescription' => 'This plugin will display a list of the available languages for the Piwik interface. The language selected will be saved in the preferences for each user.',
'LanguagesManager_AboutPiwikTranslations' => 'About Piwik translations',
- 'Live_PluginDescription' => 'Spy on your visitors, live, in real-time!',
+ 'Live_PluginDescription' => 'Watch your visitors live in real-time!',
'Live_LinkVisitorLog' => 'View detailed visitor log',
'Live_Actions' => 'Actions',
'Live_Action' => 'Action',
diff --git a/plugins/Installation/FormDatabaseSetup.php b/plugins/Installation/FormDatabaseSetup.php
index e288fe0ea2..ed1edaf4ab 100644
--- a/plugins/Installation/FormDatabaseSetup.php
+++ b/plugins/Installation/FormDatabaseSetup.php
@@ -213,7 +213,11 @@ class Piwik_Installation_FormDatabaseSetup_Rule_checkUserPrivileges extends HTML
{
try
{
- $db->exec($sql);
+ if( in_array($privilegeType, array('SELECT'))) {
+ $db->fetchAll($sql);
+ } else {
+ $db->exec($sql);
+ }
}
catch (Exception $ex)
{