Merge branch 'master' of git://github.com/gallery/gallery3

2 files changed, 3 insertions, 2 deletions

diff --git a/index.php b/index.php
index a70053a8..3acbea74 100644
--- a/index.php
+++ b/index.php
@@ -27,7 +27,7 @@ version_compare(PHP_VERSION, '5.2.3', '<') and exit('Gallery requires PHP 5.2.3
 !ini_get('short_open_tag') and exit('Gallery requires short_open_tag to be on.');
 
 // Set the error reporting level.  Use E_ALL unless you have a special need.
-error_reporting(E_NONE);
+error_reporting(0);
 
 // Disabling display_errors will  effectively disable Kohana error display
 // and logging. You can turn off Kohana errors in application/config/config.php
diff --git a/installer/installer.php b/installer/installer.php
index ab2963ba..1a36ddb5 100644
--- a/installer/installer.php
+++ b/installer/installer.php
@@ -50,6 +50,7 @@ class installer {
 
   static function unpack_sql($config) {
     $prefix = $config["prefix"];
+    $buf = null;
     foreach (file(DOCROOT . "installer/install.sql") as $line) {
       $buf .= $line;
       if (preg_match("/;$/", $buf)) {
@@ -133,4 +134,4 @@ class installer {
   static function prepend_prefix($prefix, $sql) {
     return  preg_replace("#{([a-zA-Z0-9_]+)}#", "{$prefix}$1", $sql);
   }
-}
\ No newline at end of file
+}