summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-01-30 21:26:14 +0100
committerAndrey Andreev <narf@devilix.net>2014-01-30 21:26:14 +0100
commit76160bc9ea5f0f4c653300231e34faa445342d83 (patch)
treee60de73f4b4860bd3f17b26f2620923ec6207e2b /system
parent84c090162f277ccd47a78886a1c9295add96e752 (diff)
Previous 2 commits were just dumb
Diffstat (limited to 'system')
-rw-r--r--system/core/Common.php4
-rw-r--r--system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/system/core/Common.php b/system/core/Common.php
index cfc63c2aa..e5dd84369 100644
--- a/system/core/Common.php
+++ b/system/core/Common.php
@@ -598,14 +598,14 @@ if ( ! function_exists('_exception_handler'))
return;
}
+ $_error->log_exception($severity, $message, $filepath, $line);
+
// Should we display the error?
if ((bool) ini_get('display_errors') === TRUE)
{
$_error->show_php_error($severity, $message, $filepath, $line);
}
- $_error->log_exception($severity, $message, $filepath, $line);
-
// If the error is fatal, the execution of the script should be stopped because
// errors can't be recovered from. Halting the script conforms with PHP's
// default error handling. See http://www.php.net/manual/en/errorfunc.constants.php
diff --git a/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php b/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php
index 8abe66e53..507abda51 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php
@@ -87,7 +87,7 @@ class CI_DB_pdo_pgsql_driver extends CI_DB_pdo_driver {
if ( ! empty($this->username))
{
- $this->dsn .= ';username=$this->username';
+ $this->dsn .= ';username='.$this->username;
empty($this->password) OR $this->dsn .= ';password='.$this->password;
}
}