diff options
author | mattab <matthieu.aubry@gmail.com> | 2013-08-11 13:19:59 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2013-08-11 13:19:59 +0400 |
commit | f9b15e948fc9639ada0f925a5d450e6e158b5f56 (patch) | |
tree | 3d6a25c8a271deee7d1136a11c11926be1d33529 /core/Db | |
parent | a96ec40e983a8b64f4c25def541a519ff3670e6a (diff) | |
parent | 64ca5d548c0cf0c4eef9f5f104901fbf14800127 (diff) |
Merge remote-tracking branch 'origin/master' into plugin_namespaces
Conflicts:
core/Tracker/Request.php
core/ViewDataTable.php
core/ViewDataTable/HtmlTable/Goals.php
plugins/Actions/Actions.php
plugins/Annotations/API.php
plugins/CoreHome/CoreHome.php
plugins/DBStats/DBStats.php
plugins/DevicesDetection/DevicesDetection.php
plugins/Goals/Goals.php
plugins/Live/Live.php
plugins/Referers/Referers.php
plugins/UserSettings/UserSettings.php
plugins/UsersManager/API.php
plugins/VisitTime/VisitTime.php
plugins/VisitorInterest/VisitorInterest.php
Diffstat (limited to 'core/Db')
-rw-r--r-- | core/Db/Adapter.php | 2 | ||||
-rw-r--r-- | core/Db/Adapter/Pdo/Mysql.php | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/core/Db/Adapter.php b/core/Db/Adapter.php index ca66d53c91..55283b608d 100644 --- a/core/Db/Adapter.php +++ b/core/Db/Adapter.php @@ -75,7 +75,7 @@ class Adapter */ private static function getAdapterClassName($adapterName) { - return 'Piwik\Db\Adapter\\' . str_replace(' ', '\\', ucwords(str_replace('_', ' ', strtolower($adapterName)))); + return 'Piwik\Db\Adapter\\' . str_replace(' ', '\\', ucwords(str_replace(array('_','\\'), ' ', strtolower($adapterName)))); } /** diff --git a/core/Db/Adapter/Pdo/Mysql.php b/core/Db/Adapter/Pdo/Mysql.php index 34ec106a87..bd14b9ddf4 100644 --- a/core/Db/Adapter/Pdo/Mysql.php +++ b/core/Db/Adapter/Pdo/Mysql.php @@ -198,6 +198,9 @@ class Mysql extends Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface return null; } + /** + * @var \Zend_Db_Statement_Pdo[] + */ private $cachePreparedStatement = array(); /** |