@@ -29,15 +29,17 @@ $trigger = Trigger::current(); + $trigger->filter($this, "page"); + if ($this->filtered) { $this->title_unfiltered = $this->title; $this->body_unfiltered = $this->body; $trigger->filter($this->title, array("markup_title", "markup_page_title"), $this); $trigger->filter($this->body, array("markup_text", "markup_page_text"), $this); - } - $trigger->filter($this, "page"); + $trigger->filter($this, "filter_page"); + } } /** includes/model/Page.php @@ -92,7 +92,8 @@ Trigger::current()->filter($this, "post"); - $this->filter(); + if ($this->filtered) + $this->filter(); } /** @@ -627,9 +628,6 @@ * Filters the post attributes through filter_post and any Feather filters. */ private function filter() { - if (!$this->filtered) - return; - $trigger = Trigger::current(); $class = camelize($this->feather); includes/model/Post.php @@ -31,6 +31,8 @@ $trigger = Trigger::current(); + $trigger->filter($this, "comment"); + if ($this->filtered) { if (($this->status != "pingback" and !$this->status != "trackback") and !$group->can("code_in_comments")) $this->body = strip_tags($this->body, "<".join("><", Config::current()->allowed_comment_html).">"); @@ -38,10 +40,9 @@ $this->body_unfiltered = $this->body; $trigger->filter($this->body, array("markup_text", "markup_comment_text")); + $trigger->filter($this, "filter_comment"); } - - $trigger->filter($this, "comment"); } /** modules/comments/model.Comment.php @@ -218,7 +218,7 @@ foreach($sql->select("post_attributes", "*", array("name" => "tags", - "value like" => "%: ".$_GET['name']."\n%"))->fetchAll() as $tag) { # TODO: Is this the correct search method? + "value like" => "%: \"".$_GET['name']."\"\n%"))->fetchAll() as $tag) { $post_tags = YAML::load($tag["value"]); $tags = array_merge($tags, $post_tags); @@ -268,7 +268,7 @@ foreach($sql->select("post_attributes", "*", array("name" => "tags", - "value like" => "%\n".$_POST['original'].": %"))->fetchAll() as $tag) { # TODO: Is this the correct search method? + "value like" => "%\n".$_POST['original'].": \"%"))->fetchAll() as $tag) { $tags = YAML::load($tag["value"]); unset($tags[$_POST['original']]); @@ -289,7 +289,7 @@ foreach($sql->select("post_attributes", "*", array("name" => "tags", - "value like" => "%: ".$_GET['clean']."\n%"))->fetchAll() as $tag) { # TODO: Is this the correct search method? + "value like" => "%: \"".$_GET['clean']."\"\n%"))->fetchAll() as $tag) { $tags = YAML::load($tag["value"]); unset($tags[$_GET['name']]); @@ -347,7 +347,7 @@ $likes = array(); foreach ($tags as $name) - $likes[] = "%: ".$name."\n%"; + $likes[] = "%: \"".$name."\"\n%"; $attributes = $sql->select("post_attributes", array("value", "post_id"), modules/tags/tags.php @@ -80,6 +80,9 @@ $tags[$attr["post_id"]]["unclean"] = $attr["value"]; else $tags[$attr["post_id"]]["clean"] = $attr["value"]; + + if (empty($tags)) + return; foreach ($tags as $post_id => $tags) { $yaml = YAML::dump(parseTags($tags["unclean"], $tags["clean"])); @@ -102,4 +105,4 @@ update_tags_structure(); move_to_post_attributes(); - move_to_yaml(); \ No newline at end of file + move_to_yaml(); modules/tags/upgrades.php 5f37681d40109641a59b6f845dbac7218342b649 Alex Suraci i.am@toogeneric.com http://github.com/vito/chyrp/commit/372e77c4f2ba61ae9a718d29e525fc76d2952a14 372e77c4f2ba61ae9a718d29e525fc76d2952a14 2008-11-13T13:03:56-08:00 2008-11-13T13:03:56-08:00 * Model filter syncing. * Updated the Tagginator module to conform with the new YAML quoting method. 2f5171598ea1b28b5962838f1139adb8fe7ad020 Alex Suraci i.am@toogeneric.com