diff options
| author | mattpiwik <matthieu.aubry@gmail.com> | 2008-11-27 20:19:36 +0300 |
|---|---|---|
| committer | mattpiwik <matthieu.aubry@gmail.com> | 2008-11-27 20:19:36 +0300 |
| commit | 344fee1c16adb78a64e4b233a4acbc3700269f1d (patch) | |
| tree | 8b61d72e82ddc63d9c32fce3ccce50f5979e81b0 /core/Option.php | |
| parent | ed03a63ff38ba8ced26b2ef7609580f61e76c8e7 (diff) | |
- fixing #444 Piwik uses MySQL reserved word 'option' for table name
git-svn-id: http://dev.piwik.org/svn/trunk@777 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'core/Option.php')
| -rw-r--r-- | core/Option.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/core/Option.php b/core/Option.php index f049dcebcf..4fa4c9baee 100644 --- a/core/Option.php +++ b/core/Option.php @@ -29,7 +29,7 @@ class Piwik_Option return $this->all[$name]; } $value = Piwik_FetchOne( 'SELECT option_value - FROM ' . Piwik::prefixTable('option') . ' + FROM `' . Piwik::prefixTable('option') . '` WHERE option_name = ?', $name); if($value === false) { @@ -42,7 +42,7 @@ class Piwik_Option public function set($name, $value, $autoload = 0) { $autoload = (int)$autoload; - Piwik_Query('INSERT INTO '. Piwik::prefixTable('option') . ' (option_name, option_value, autoload) '. + Piwik_Query('INSERT INTO `'. Piwik::prefixTable('option') . '` (option_name, option_value, autoload) '. ' VALUES (?, ?, ?) '. ' ON DUPLICATE KEY UPDATE option_value = ?', array($name, $value, $autoload, $value)); @@ -56,10 +56,11 @@ class Piwik_Option { return; } + $all = array(); try { - $all = Piwik_FetchAll('SELECT option_value, option_name ' . - ' FROM '. Piwik::prefixTable('option') . - ' WHERE autoload = 1'); + $all = Piwik_FetchAll('SELECT option_value, option_name + FROM `'. Piwik::prefixTable('option') . '` + WHERE autoload = 1'); } catch(Exception $e) { // this would fail for users who upgraded between 0.2.10 and 0.2.13 where option table didn't have the autoload field yet } |