Merge branch 'wip-mdl-41266' of https://github.com/rajeshtaneja/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 4 Mar 2014 08:59:10 +0000 (16:59 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 4 Mar 2014 08:59:10 +0000 (16:59 +0800)
admin/tool/log/store/database/classes/helper.php
admin/tool/log/store/database/classes/log/store.php

index 6c6f884..1acb99c 100644 (file)
@@ -39,6 +39,7 @@ class helper {
      */
     public static function get_drivers() {
         return array(
+            ''               => get_string('choosedots'),
             'native/mysqli'  => \moodle_database::get_driver_instance('mysqli', 'native')->get_name(),
             'native/mariadb' => \moodle_database::get_driver_instance('mariadb', 'native')->get_name(),
             'native/pgsql'   => \moodle_database::get_driver_instance('pgsql', 'native')->get_name(),
index d484c7c..aad8c92 100644 (file)
@@ -70,7 +70,7 @@ class store implements \tool_log\log\writer, \core\log\sql_select_reader {
         }
 
         $dbdriver = $this->get_config('dbdriver');
-        if (!$dbdriver) {
+        if (empty($dbdriver)) {
             $this->extdb = false;
             return false;
         }