Merge branch 'master' into talmdal_dev

Conflicts:
	modules/gallery/controllers/albums.php
	modules/gallery/controllers/movies.php
	modules/gallery/controllers/photos.php

1 files changed, 13 insertions, 12 deletions

diff --git a/modules/gallery/controllers/packager.php b/modules/gallery/controllers/packager.php
index 1354a01b..2592da31 100644
--- a/modules/gallery/controllers/packager.php
+++ b/modules/gallery/controllers/packager.php
@@ -30,7 +30,7 @@ class Packager_Controller extends Controller {
       $this->_dump_database();        // Dump the database
       $this->_dump_var();             // Dump the var directory
     } catch (Exception $e) {
-      print $e->getTraceAsString();
+      print $e->getMessage() . "\n" . $e->getTraceAsString();
       return;
     }
 
@@ -38,11 +38,9 @@ class Packager_Controller extends Controller {
   }
 
   private function _reset() {
-    $db = Database::instance();
-
     // Drop all tables
-    foreach ($db->list_tables() as $table) {
-      $db->query("DROP TABLE IF EXISTS `$table`");
+    foreach (Database::instance()->list_tables() as $table) {
+      Database::instance()->query("DROP TABLE IF EXISTS {{$table}}");
     }
 
     // Clean out data
@@ -53,7 +51,7 @@ class Packager_Controller extends Controller {
     dir::unlink(VARPATH . "modules");
     dir::unlink(VARPATH . "tmp");
 
-    $db->clear_cache();
+    Database::instance()->clear_cache();
     module::$modules = array();
     module::$active = array();
 
@@ -84,12 +82,15 @@ class Packager_Controller extends Controller {
       module::set_var("gallery", "blocks_{$key}", serialize($blocks));
     }
 
-    $db = Database::instance();
-    $db->query("TRUNCATE {sessions}");
-    $db->query("TRUNCATE {logs}");
-    $db->query("DELETE FROM {vars} WHERE `module_name` = 'gallery' AND `name` = '_cache'");
-    $db->update("users", array("password" => ""), array("id" => 1));
-    $db->update("users", array("password" => ""), array("id" => 2));
+    Database::instance()->query("TRUNCATE {sessions}");
+    Database::instance()->query("TRUNCATE {logs}");
+    db::build()
+      ->delete("vars")
+      ->where("module_name", "=", "gallery")
+      ->where("name", "=", "_cache")
+      ->execute();
+    db::build()->update("users", array("password" => ""), array("id" => 1))->execute();
+    db::build()->update("users", array("password" => ""), array("id" => 2))->execute();
 
     $dbconfig = Kohana::config('database.default');
     $conn = $dbconfig["connection"];