Merge branch 'master' of https://github.com/joaomachado/horde

horde · Mar 17, 2016 · 29abc91 · 29abc91
2 parents a68c0a3 + 1fd89e4
commit 29abc91
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/ingo/lib/Storage/Sql.php b/ingo/lib/Storage/Sql.php
@@ -218,7 +218,7 @@ protected function _loadFromBackend()
                 break;
 
             default:
-                $columns = $this->_db->columns($this->_params['table_rules']);
+                $columns = $this->_params['db']->columns($this->_params['table_rules']);
                 $ob->combine = intval($row['rule_combine']);
                 $ob->conditions = empty($row['rule_conditions'])
                     ? null :