Merge branch 'master' of github.com:sunnysingh/database

sunnysingh · Oct 2, 2011 · 6a41de0 · 6a41de0
2 parents cc72b1c + d58274d
commit 6a41de0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/database.php b/database.php
@@ -108,9 +108,9 @@ public function query($query, $params = array()) {
    }
   } else {
    $this->query_count_error++;
+   $debug_backtrace = debug_backtrace();
    error_log("MySQL database error:  ".$this->connection->error." for query ".$query." in ".$debug_backtrace[1]["file"]." on line ".$debug_backtrace[1]["line"]);
    if ($this->debug) {
-    $debug_backtrace = debug_backtrace();
     echo "Database error: ".$this->connection->error." for query <code>".$query."</code> in ".$debug_backtrace[1]["file"]." on line ".$debug_backtrace[1]["line"];
     exit();
    }

diff --git a/docs.md b/docs.md
@@ -245,8 +245,8 @@ $db->add_filter("query", function($query) {
 
  return str_replace(
 
-  array("accounts", "music"),
+  array("accounts.", "music."),
-  array("bob_accounts", "bob_music"),
+  array("bob_accounts.", "bob_music."),
 
  $query);