summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDracony <draconyster@gmail.com>2013-01-14 21:02:25 +0200
committerDracony <draconyster@gmail.com>2013-01-14 21:02:25 +0200
commit3ad1ef6996c84ef2a6e50a62faab0b81fc76f1e3 (patch)
treeae930410bd4480e3314555206e1d57da2713017b
parentdf6078bae52040bc267ee1c97c5dae6396863e5a (diff)
downloadPHPixie-3ad1ef6996c84ef2a6e50a62faab0b81fc76f1e3.zip
PHPixie-3ad1ef6996c84ef2a6e50a62faab0b81fc76f1e3.tar.gz
PHPixie-3ad1ef6996c84ef2a6e50a62faab0b81fc76f1e3.tar.bz2
Fix to config default value
-rw-r--r--modules/database/classes/driver/mysql/db.php9
-rw-r--r--system/classes/config.php2
2 files changed, 9 insertions, 2 deletions
diff --git a/modules/database/classes/driver/mysql/db.php b/modules/database/classes/driver/mysql/db.php
index 879d1b8..e5a63df 100644
--- a/modules/database/classes/driver/mysql/db.php
+++ b/modules/database/classes/driver/mysql/db.php
@@ -13,7 +13,14 @@ class DB_Mysql_Driver extends DB{
* @link http://php.net/manual/en/class.mysqli.php
*/
public $conn;
-
+
+ /**
+ * Type of the database, mysql.
+ * @var string
+ * @access public
+ */
+ public $db_type='mysql';
+
/**
* Initializes database connection
*
diff --git a/system/classes/config.php b/system/classes/config.php
index aa07c33..1af6d59 100644
--- a/system/classes/config.php
+++ b/system/classes/config.php
@@ -94,7 +94,7 @@ class Config {
break;
}
- if (isset($p[1]))
+ if (array_key_exists (1,$p))
return $p[1];
throw new Exception("Configuration not set for {$p[0]}.");