0
@@ -199,6 +199,6 @@
0
       if (Trigger::current()->exists("delete_".$model))
0
         Trigger::current()->call("delete_".$model, new $class($id));
0
 
0
-      SQL::current()->delete(pluralize($model), "id = :id", array(":id" => $id));
0
+      SQL::current()->delete(pluralize($model), array("id" => $id));
0
     }
0
   }

0
@@ -46,7 +46,7 @@
0
 
0
       $sql = SQL::current();
0
 
0
-      if ($sql->count("sessions", "id = :id", array(":id" => $id)))
0
+      if ($sql->count("sessions", array("id" => $id)))
0
         $sql->update("sessions",
0
                      array("id" => $id),
0
                      array("data" => $data,

0
@@ -471,10 +471,8 @@
0
             Post::delete($post->id);
0
         elseif ($_POST['posts'] == "move")
0
           $sql->update("posts",
0
-                       "user_id = :deleting_id",
0
-                       array("user_id" => ":user_id"),
0
-                       array(":user_id" => $_POST['move_posts'],
0
-                             ":deleting_id" => $user->id));
0
+                       array("user_id" => $user->id),
0
+                       array("user_id" => $_POST['move_posts']));
0
       }
0
 
0
       if (isset($_POST['pages'])) {
0
@@ -483,10 +481,8 @@
0
             Page::delete($page->id);
0
         elseif ($_POST['pages'] == "move")
0
           $sql->update("pages",
0
-                       "user_id = :deleting_id",
0
-                       array("user_id" => ":user_id"),
0
-                       array(":user_id" => $_POST['move_pages'],
0
-                             ":deleting_id" => $user->id));
0
+                       array("user_id" => $user->id),
0
+                       array("user_id" => $_POST['move_pages']));
0
       }
0
 
0
       User::delete($_POST['id']);
0
@@ -883,26 +879,23 @@
0
         $import = YAML::load($_FILES['groups_file']['tmp_name']);
0
 
0
         foreach ($import["groups"] as $name => $permissions)
0
-          if (!$sql->count("groups", "name = :name", array(":name" => $name)))
0
+          if (!$sql->count("groups", array("name" => $name)))
0
             $trigger->call("import_chyrp_group", Group::add($name, (array) $permissions));
0
 
0
         foreach ($import["permissions"] as $id => $name)
0
-          if (!$sql->count("permissions", "id = :id", array(":id" => $id)))
0
-            $sql->insert("permissions",
0
-                         array("id" => ":id", "name" => ":name"),
0
-                         array(":id" => $id, ":name" => $name));
0
+          if (!$sql->count("permissions", array("id" => $id)))
0
+            $sql->insert("permissions", array("id" => $id, "name" => $name));
0
       }
0
 
0
       if (isset($_FILES['users_file']) and $_FILES['users_file']['error'] == 0) {
0
         $users = YAML::load($_FILES['users_file']['tmp_name']);
0
 
0
         foreach ($users as $login => $user) {
0
-          $group_id = $sql->select("groups", "id", "name = :name", "id DESC",
0
-                                   array(":name" => $user["group"]))->fetchColumn();
0
+          $group_id = $sql->select("groups", "id", array("name" => $user["group"]), "id DESC")->fetchColumn();
0
 
0
           $group = ($group_id) ? $group_id : $config->default_group ;
0
 
0
-          if (!$sql->count("users", "login = :login", array(":login" => $login)))
0
+          if (!$sql->count("users", array("login" => $login)))
0
             $user = User::add($login,
0
                               $user["password"],
0
                               $user["email"],
0
@@ -920,8 +913,7 @@
0
           $chyrp = $entry->children("http://chyrp.net/export/1.0/");
0
 
0
           $login = $entry->author->children("http://chyrp.net/export/1.0/")->login;
0
-          $user_id = $sql->select("users", "id", "login = :login", "id DESC",
0
-                                  array(":login" => $login))->fetchColumn();
0
+          $user_id = $sql->select("users", "id", array("login" => $login), "id DESC")->fetchColumn();
0
 
0
           $data = Post::xml2arr($entry->content);
0
 
0
@@ -951,8 +943,7 @@
0
           $attr  = $entry->attributes("http://chyrp.net/export/1.0/");
0
 
0
           $login = $entry->author->children("http://chyrp.net/export/1.0/")->login;
0
-          $user_id = $sql->select("users", "id", "login = :login", "id DESC",
0
-                                  array(":login" => $login))->fetchColumn();
0
+          $user_id = $sql->select("users", "id", array("login" => $login), "id DESC")->fetchColumn();
0
 
0
           $page = Page::add($entry->title,
0
                             $entry->content,

0
@@ -246,7 +246,7 @@
0
                           "/(vert|ind)ices$/i" => "\\1ex",
0
                           "/(matr)ices$/i" => "\\1ix",
0
                           "/(x|ch|ss|sh)es$/i" => "\\1",
0
-                          "/([m|l])ice$/i" => "\\1ouse",
0
+                          "/([ml])ice$/i" => "\\1ouse",
0
                           "/(quiz)zes$/i" => "\\1");
0
 
0
     $replaced = preg_replace(array_keys($replacements), array_values($replacements), $string, 1);

0
@@ -106,9 +106,9 @@
0
         return false;
0
 
0
       $sql = SQL::current();
0
-      $sql->update("groups", "id = :id",
0
-                   array("name" => ":name", "permissions" => ":permissions"),
0
-                   array(":name" => $name, ":permissions" => YAML::dump($permissions), ":id" => $this->id));
0
+      $sql->update("groups",
0
+                   array("id" => $this->id),
0
+                   array("name" => $name, "permissions" => YAML::dump($permissions)));
0
 
0
       Trigger::current()->call("update_group", $this, $name, $permissions);
0
     }
0
@@ -135,11 +135,11 @@
0
     static function add_permission($id, $name = null) {
0
       $sql = SQL::current();
0
 
0
-      if ($sql->count("permissions", "id = :id", array(":id" => $id)))
0
+      if ($sql->count("permissions", array("id" => $id)))
0
         return; # Permission already exists.
0
 
0
       fallback($name, camelize($id, true));
0
-      $sql->insert("permissions", array("id" => ":id", "name" => ":name"), array(":id" => $id, ":name" => $name));
0
+      $sql->insert("permissions", array("id" => $id, "name" => $name));
0
     }
0
 
0
     /**
0
@@ -150,7 +150,7 @@
0
      *     $id - The ID of the permission to remove.
0
      */
0
     static function remove_permission($id) {
0
-      SQL::current()->delete("permissions", "id = :id", array(":id" => $id));
0
+      SQL::current()->delete("permissions", array("id" => $id));
0
     }
0
 
0
     /**
0
@@ -163,8 +163,7 @@
0
 
0
       return (isset($this->size)) ? $this->size :
0
              $this->size = SQL::current()->count("users",
0
-                                                 "group_id = :group_id",
0
-                                                 array(":group_id" => $this->id)) ;
0
+                                                 array("group_id" => $this->id)) ;
0
     }
0
 
0
     /**

0
@@ -114,26 +114,14 @@
0
 
0
       $sql = SQL::current();
0
       $sql->update("pages",
0
-                   "id = :id",
0
-                   array(
0
-                       "title" => ":title",
0
-                       "body" => ":body",
0
-                       "parent_id" => ":parent_id",
0
-                       "show_in_list" => ":show_in_list",
0
-                       "list_order" => ":list_order",
0
-                       "updated_at" => ":updated_at",
0
-                       "url" => ":url"
0
-                   ),
0
-                   array(
0
-                       ":title" => $title,
0
-                       ":body" => $body,
0
-                       ":parent_id" => $parent_id,
0
-                       ":show_in_list" => $show_in_list,
0
-                       ":list_order" => $list_order,
0
-                       ":updated_at" => ($update_timestamp) ? datetime() : $this->updated_at,
0
-                       ":url" => $url,
0
-                       ":id" => $this->id
0
-                   ));
0
+                   array("id" => $this->id),
0
+                   array("title" => $title,
0
+                         "body" => $body,
0
+                         "parent_id" => $parent_id,
0
+                         "show_in_list" => $show_in_list,
0
+                         "list_order" => $list_order,
0
+                         "updated_at" => ($update_timestamp) ? datetime() : $this->updated_at,
0
+                         "url" => $url));
0
 
0
       $trigger = Trigger::current();
0
       $trigger->call("update_page", $this, $title, $body, $parent_id, $show_in_list, $list_order, $url, $update_timestamp);
0
@@ -167,7 +155,7 @@
0
      *     true - if a page with that ID is in the database.
0
      */
0
     static function exists($page_id) {
0
-      return SQL::current()->count("pages", "id = :id", array(":id" => $post_id));
0
+      return SQL::current()->count("pages", array("id" => $post_id));
0
     }
0
 
0
     /**
0
@@ -181,11 +169,7 @@
0
      *     $url - The unique version of the passed clean URL. If it's not used, it's the same as $clean. If it is, a number is appended.
0
      */
0
     static function check_url($clean) {
0
-      $sql = SQL::current();
0
-      $count = $sql->count("pages",
0
-                           "clean = :clean",
0
-                           array(":clean" => $clean));
0
-
0
+      $count = SQL::current()->count("pages", array("clean" => $clean));
0
       return (!$count or empty($clean)) ? $clean : $clean."-".($count + 1) ;
0
     }
0
 

0
@@ -184,12 +184,9 @@
0
 
0
       if (empty($clean) or empty($url))
0
         $sql->update("posts",
0
-                     "id = :id",
0
-                     array("clean" => ":clean",
0
-                           "url" => ":url"),
0
-                     array(":clean" => $feather.".".$id,
0
-                           ":url" => $feather.".".$id,
0
-                           ":id" => $id));
0
+                     array("id" => $id),
0
+                     array("clean" => $feather.".".$id,
0
+                           "url" => $feather.".".$id));
0
 
0
       if ($trackbacks !== "") {
0
         $trackbacks = explode(",", $trackbacks);
0
@@ -269,22 +266,14 @@
0
 
0
       $sql = SQL::current();
0
       $sql->update("posts",
0
-                   "id = :id",
0
-                   array("xml" => ":xml",
0
-                         "pinned" => ":pinned",
0
-                         "status" => ":status",
0
-                         "clean" => ":clean",
0
-                         "url" => ":url",
0
-                         "created_at" => ":created_at",
0
-                         "updated_at" => ":updated_at"),
0
-                   array(":xml" => $xml->asXML(),
0
-                         ":pinned" => $pinned,
0
-                         ":status" => $status,
0
-                         ":clean" => $slug,
0
-                         ":url" => $slug,
0
-                         ":created_at" => $created_at,
0
-                         ":updated_at" => $updated_at,
0
-                         ":id" => $this->id));
0
+                   array("id" => $this->id),
0
+                   array("xml" => $xml->asXML(),
0
+                         "pinned" => $pinned,
0
+                         "status" => $status,
0
+                         "clean" => $slug,
0
+                         "url" => $slug,
0
+                         "created_at" => $created_at,
0
+                         "updated_at" => $updated_at));
0
 
0
       $trigger = Trigger::current();
0
       $trigger->call("update_post", $this, $values, $user, $pinned, $status, $slug, $created_at, $updated_at, $options);
0
@@ -402,7 +391,7 @@
0
      *     true - if a post with that ID is in the database.
0
      */
0
     static function exists($post_id) {
0
-      return SQL::current()->count("posts", "id = :id", array(":id" => $post_id));
0
+      return SQL::current()->count("posts", array("id" => $post_id));
0
     }
0
 
0
     /**
0
@@ -416,11 +405,7 @@
0
      *     $url - The unique version of the passed clean URL. If it's not used, it's the same as $clean. If it is, a number is appended.
0
      */
0
     static function check_url($clean) {
0
-      $sql = SQL::current();
0
-      $count = $sql->count("posts",
0
-                           "clean = :clean",
0
-                           array(":clean" => $clean));
0
-
0
+      $count = SQL::current()->count("posts", array("clean" => $clean));
0
       return (!$count or empty($clean)) ? $clean : $clean."-".($count + 1) ;
0
     }
0
 
0
@@ -712,14 +697,21 @@
0
      */
0
     static function arr2xml(&$object, $data) {
0
       foreach ($data as $key => $val) {
0
-        if (is_int($key) and (empty($val) or trim($val) == "")) {
0
+        if (is_int($key) and (empty($val) or (is_string($val) and trim($val) == ""))) {
0
           unset($data[$key]);
0
           continue;
0
         }
0
 
0
         if (is_array($val)) {
0
-          $xml = $object->addChild($key);
0
-          self::arr2xml($xml, $val);
0
+          if (in_array(0, array_keys($val))) { # Numeric-indexed things need to be added as duplicates
0
+            foreach ($val as $dup) {
0
+              $xml = $object->addChild($key);
0
+              arr2xml($xml, $dup);
0
+            }
0
+          } else {
0
+            $xml = $object->addChild($key);
0
+            arr2xml($xml, $val);
0
+          }
0
         } else
0
           $object->addChild($key, fix($val, false, false));
0
       }
0
@@ -770,15 +762,10 @@
0
         if (in_array($attr, $times)) {
0
           $where[] = strtoupper($attr)."(created_at) = :created_".$attr;
0
           $params[':created_'.$attr] = $get[$attr];
0
-        } elseif ($attr == "author")
0
-          $where["user_id"] = SQL::current()->select("users",
0
-                                                "id",
0
-                                                "login = :login",
0
-                                                "id",
0
-                                                array(
0
-                                                    ":login" => $get['author']
0
-                                                ), 1)->fetchColumn();
0
-        elseif ($attr == "feathers")
0
+        } elseif ($attr == "author") {
0
+          $user = new User(array("where" => array("login" => $get['author'])));
0
+          $where["user_id"] = $user->id;
0
+        } elseif ($attr == "feathers")
0
           $where["feather"] = depluralize($get['feathers']);
0
         else {
0
           $tokens = array($where, $params, $attr);
0
@@ -789,8 +776,7 @@
0
             if (!isset($get[$attr]))
0
               continue;
0
 
0
-            $where[] = $attr." = :attr".$attr;
0
-            $params[":attr".$attr] = $get[$attr];
0
+            $where[$attr] = $get[$attr];
0
           }
0
         }
0
 

0
@@ -115,23 +115,13 @@
0
 
0
       $sql = SQL::current();
0
       $sql->update("users",
0
-                   "id = :id",
0
-                   array(
0
-                       "login" => ":login",
0
-                       "password" => ":password",
0
-                       "email" => ":email",
0
-                       "full_name" => ":full_name",
0
-                       "website" => ":website",
0
-                       "group_id" => ":group_id"),
0
-                   array(
0
-                       ":login" => strip_tags($login),
0
-                       ":password" => $password,
0
-                       ":email" => strip_tags($email),
0
-                       ":full_name" => strip_tags($full_name),
0
-                       ":website" => strip_tags($website),
0
-                       ":group_id" => $group_id,
0
-                       ":id" => $this->id
0
-                  ));
0
+                   array("id" => $this->id),
0
+                   array("login" => strip_tags($login),
0
+                         "password" => $password,
0
+                         "email" => strip_tags($email),
0
+                         "full_name" => strip_tags($full_name),
0
+                         "website" => strip_tags($website),
0
+                         "group_id" => $group_id));
0
 
0
       Trigger::current()->call("update_user", $this, $login, $password, $full_name, $email, $website, $group_id);
0
     }

0
@@ -288,21 +288,14 @@
0
       $config->set("default_group", $group_id["member"]);
0
       $config->set("guest_group", $group_id["guest"]);
0
 
0
-      if (!$sql->select("users", "id", "login = :login", null, array(":login" => $_POST['login']))->fetchColumn())
0
+      if (!$sql->select("users", "id", array("login" => $_POST['login']))->fetchColumn())
0
         $sql->insert("users",
0
-                     array("login" => ":login",
0
-                           "password" => ":password",
0
-                           "email" => ":email",
0
-                           "website" => ":website",
0
-                           "group_id" => ":group_id",
0
-                           "joined_at" => ":joined_at"),
0
-                     array(":login" => $_POST['login'],
0
-                           ":password" => md5($_POST['password_1']),
0
-                           ":email" => $_POST['email'],
0
-                           ":website" => $config->url,
0
-                           ":group_id" => $group_id["admin"],
0
-                           ":joined_at" => datetime()
0
-                     ));
0
+                     array("login" => $_POST['login'],
0
+                           "password" => md5($_POST['password_1']),
0
+                           "email" => $_POST['email'],
0
+                           "website" => $config->url,
0
+                           "group_id" => $group_id["admin"],
0
+                           "joined_at" => datetime()));
0
 
0
       $installed = true;
0
     }

0
@@ -198,10 +198,8 @@
0
     static function trackback_receive($url, $title, $excerpt, $blog_name) {
0
       $sql = SQL::current();
0
       $count = $sql->count("comments",
0
-                           array("post_id = :id",
0
-                                 "author_url = :url"),
0
-                           array(":id" => $_GET['id'],
0
-                                 ":url" => $_POST['url']));
0
+                           array("post_id" => $_GET['id'],
0
+                                 "author_url" => $_POST['url']));
0
       if ($count)
0
         trackback_respond(true, __("A ping from that URL is already registered.", "comments"));
0
 
0
@@ -216,10 +214,8 @@
0
     static function pingback($id, $to, $from, $title, $excerpt) {
0
       $sql = SQL::current();
0
       $count = $sql->count("comments",
0
-                           array("post_id = :id",
0
-                                 "author_url = :url"),
0
-                           array(":id" => $id,
0
-                                 ":url" => $from));
0
+                           array("post_id" => $id,
0
+                                 "author_url" => $from));
0
       if ($count)
0
         return new IXR_Error(48, __("A ping from that URL is already registered.", "comments"));
0
 
0
@@ -232,11 +228,11 @@
0
     }
0
 
0
     static function delete_post($post) {
0
-      SQL::current()->delete("comments", "post_id = :id", array(":id" => $post->id));
0
+      SQL::current()->delete("comments", array("post_id" => $post->id));
0
     }
0
 
0
     static function delete_user($user) {
0
-      SQL::current()->update("comments", "user_id = :id", array("user_id" => 0), array(":id" => $user->id));
0
+      SQL::current()->update("comments", array("user_id" => $user->id), array("user_id" => 0));
0
     }
0
 
0
     static function admin_comment_settings() {
0
@@ -317,10 +313,8 @@
0
       $where[] = "status != 'spam'";
0
 
0
       $visitor = Visitor::current();
0
-      if (!$visitor->group()->can("edit_comment", "delete_comment", true)) {
0
-        $where[] = "user_id = :visitor_id";
0
-        $params[":visitor_id"] = $visitor->id;
0
-      }
0
+      if (!$visitor->group()->can("edit_comment", "delete_comment", true))
0
+        $where["user_id"] = $visitor->id;
0
 
0
       AdminController::current()->context["comments"] = new Paginator(Comment::find(array("placeholders" => true, "where" => $where, "params" => $params)), 25);
0
     }
0
@@ -358,7 +352,7 @@
0
           if ($comment->status == "spam")
0
             $false_positives[] = $comment->signature;
0
 
0
-          $sql->update("comments", "id = :id", array("status" => ":status"), array(":id" => $comment->id, ":status" => "denied"));
0
+          $sql->update("comments", array("id" => $comment->id), array("status" => "denied"));
0
         }
0
 
0
         Flash::notice(__("Selected comments denied.", "comments"));
0
@@ -372,7 +366,7 @@
0
           if ($comment->status == "spam")
0
             $false_positives[] = $comment->signature;
0
 
0
-          $sql->update("comments", "id = :id", array("status" => ":status"), array(":id" => $comment->id, ":status" => "approved"));
0
+          $sql->update("comments", array("id" => $comment->id), array("status" => "approved"));
0
         }
0
 
0
         Flash::notice(__("Selected comments approved.", "comments"));
0
@@ -383,7 +377,7 @@
0
           if (!$comment->editable())
0
             continue;
0
 
0
-          $sql->update("comments", "id = :id", array("status" => ":status"), array(":id" => $comment->id, ":status" => "spam"));
0
+          $sql->update("comments", array("id" => $comment->id), array("status" => "spam"));
0
 
0
           $false_negatives[] = $comment->signature;
0
         }
0
@@ -443,9 +437,7 @@
0
                                                 )"),
0
                                          "created_at ASC",
0
                                          array(":last_comment" => $_POST['last_comment'],
0
-                                               ":current_ip" => ip2long($_SERVER['REMOTE_ADDR']),
0
-                                               ":visitor_id" => $visitor->id
0
-                                         ));
0
+                                               ":visitor_id" => $visitor->id));
0
 
0
             $ids = array();
0
             while ($the_comment = $new_comments->fetchObject())
0
@@ -493,8 +485,7 @@
0
         $comment = $comment->children("http://www.w3.org/2005/Atom");
0
 
0
         $login = $comment->author->children("http://chyrp.net/export/1.0/")->login;
0
-        $user_id = $sql->select("users", "id", "login = :login", "id DESC",
0
-                                array(":login" => $login))->fetchColumn();
0
+        $user_id = $sql->select("users", "id", array("login" => $login), "id DESC")->fetchColumn();
0
 
0
         Comment::add(unfix($comment->content),
0
                      unfix($comment->author->name),
0
@@ -634,10 +625,7 @@
0
                                                 )
0
                                             )"),
0
                                      "created_at ASC", # order
0
-                                     array(":post_id" => $post->id,
0
-                                           ":current_ip" => ip2long($_SERVER['REMOTE_ADDR']),
0
-                                           ":visitor_id" => $visitor->id
0
-                                     ));
0
+                                     array(":visitor_id" => $visitor->id));
0
 
0
         $post->comments = array();
0
         foreach ($get_comments->fetchAll() as $comment)
0
@@ -672,7 +660,6 @@
0
                                                             )
0
                                                         )"));
0
 
0
-      $options["params"][":current_ip"] = ip2long($_SERVER['REMOTE_ADDR']);
0
       $options["params"][":visitor_id"] = Visitor::current()->id;
0
 
0
       $options["group"][] = "id";

0
@@ -203,22 +203,14 @@
0
     public function update($author, $author_email, $author_url, $body, $status, $timestamp, $update_timestamp = true) {
0
       $sql = SQL::current();
0
       $sql->update("comments",
0
-                   "id = :id",
0
-                   array("body" => ":body",
0
-                         "author" => ":author",
0
-                         "author_email" => ":author_email",
0
-                         "author_url" => ":author_url",
0
-                         "status" => ":status",
0
-                         "created_at" => ":created_at",
0
-                         "updated_at" => ":updated_at"),
0
-                   array(":body" => $body,
0
-                         ":author" => strip_tags($author),
0
-                         ":author_email" => strip_tags($author_email),
0
-                         ":author_url" => strip_tags($author_url),
0
-                         ":status" => $status,
0
-                         ":created_at" => $timestamp,
0
-                         ":updated_at" => ($update_timestamp) ? datetime() : $this->updated_at,
0
-                         ":id" => $this->id));
0
+                   array("id" => $this->id),
0
+                   array("body" => $body,
0
+                         "author" => strip_tags($author),
0
+                         "author_email" => strip_tags($author_email),
0
+                         "author_url" => strip_tags($author_url),
0
+                         "status" => $status,
0
+                         "created_at" => $timestamp,
0
+                         "updated_at" => ($update_timestamp) ? datetime() : $this->updated_at));
0
 
0
       Trigger::current()->call("update_comment", $this, $author, $author_email, $author_url, $body, $status, $timestamp, $update_timestamp);
0
     }
0
@@ -228,7 +220,7 @@
0
       if ($trigger->exists("delete_comment"))
0
         $trigger->call("delete_comment", new self($comment_id));
0
 
0
-      SQL::current()->delete("comments", "id = :id", array(":id" => $comment_id));
0
+      SQL::current()->delete("comments", array("id" => $comment_id));
0
     }
0
 
0
     public function editable() {
0
@@ -314,9 +306,7 @@
0
     }
0
 
0
     static function user_count($user_id) {
0
-      $sql = SQL::current();
0
-      $count = $sql->count("comments", "user_id = :user_id",
0
-                           array(":user_id" => $user_id));
0
+      $count = SQL::current()->count("comments", array("user_id" => $user_id));
0
       return $count;
0
     }
0
 

0
@@ -105,7 +105,7 @@
0
       if (!isset($_POST['tags'])) return;
0
 
0
       $sql = SQL::current();
0
-      $sql->delete("tags", "post_id = :post_id", array(":post_id" => $post->id));
0
+      $sql->delete("tags", array("post_id" => $post->id));
0
 
0
       $tags = explode(",", $_POST['tags']); // Split at the comma
0
       $tags = array_map('trim', $tags); // Remove whitespace
0
@@ -118,7 +118,7 @@
0
       $tags_cleaned_string = (!empty($tags_cleaned)) ? "{{".implode("}},{{", $tags_cleaned)."}}" : "" ;
0
 
0
       if (empty($tags_string) and empty($tags_cleaned_string))
0
-        $sql->delete("tags", "post_id = :post_id", array(":post_id" => $post->id));
0
+        $sql->delete("tags", array("post_id" => $post->id));
0
       else
0
         $sql->insert("tags", array("tags" => ":tags", "clean" => ":clean", "post_id" => ":post_id"), array(
0
                          ":tags"    => $tags_string,
0
@@ -128,7 +128,7 @@
0
     }
0
 
0
     public function delete_post($post) {
0
-      SQL::current()->delete("tags", "post_id = :post_id", array(":post_id" => $post->id));
0
+      SQL::current()->delete("tags", array("post_id" => $post->id));
0
     }
0
 
0
     public function parse_urls($urls) {
0
@@ -283,12 +283,9 @@
0
         $names = str_replace("{{".$_POST['clean']."}}", "{{".$_POST['name']."}}", $tag["tags"]);
0
         $clean = str_replace("{{".$_POST['clean']."}}", "{{".sanitize($_POST['name'])."}}", $tag["clean"]);
0
         $sql->update("tags",
0
-                     "id = :id",
0
-                     array("tags" => ":tags",
0
-                           "clean" => ":clean"),
0
-                     array(":id" => $tag["id"],
0
-                           ":tags" => $names,
0
-                           ":clean" => $clean));
0
+                     array("id" => $tag["id"]),
0
+                     array("id" => $tag["id"],
0
+                           "tags" => $names));
0
       }
0
 
0
       Flash::notice(__("Tag renamed.", "tags"), "/admin/?action=manage_tags");
0
@@ -595,7 +592,7 @@
0
     }
0
 
0
     public function posts_export($atom, $post) {
0
-      $tags = SQL::current()->select("tags", "tags", "post_id = :post_id", "id DESC", array(":post_id" => $post->id))->fetchColumn();
0
+      $tags = SQL::current()->select("tags", "tags", array("post_id" => $post->id), "id DESC")->fetchColumn();
0
       if (empty($tags)) return;
0
 
0
       $atom.= "    <chyrp:tags>".fix(implode(", ", self::unlinked_tags($tags)))."</chyrp:tags>\r";

0
@@ -309,10 +309,8 @@
0
 
0
       echo _f("Sanitizing XML data of post #%d...", array($post->id)).
0
            test(SQL::current()->update("posts",
0
-                                       "id = :post_id",
0
-                                       array("xml" => ":xml"),
0
-                                       array(":xml" => $new_xml->asXML(),
0
-                                             ":post_id" => $post->id)));
0
+                                       array("id" => $post->id),
0
+                                       array("xml" => $new_xml->asXML())));
0
     }
0
   }
0