@@ -38,7 +38,7 @@ $placeholders = (isset($this->__placeholders) and $this->__placeholders); Trigger::current()->filter($filtered, $model_name."_".$name."_attr", $this); - if (!empty($filtered)) + if ($filtered !== false) $this->$name = $filtered; $this->belongs_to = (array) $this->belongs_to; includes/class/Model.php @@ -282,8 +282,12 @@ public static function build_list($vals, $params = array()) { $return = array(); - foreach ($vals as $val) + foreach ($vals as $val) { + if (is_object($val)) # Useful catch, e.g. empty SimpleXML objects. + $val = ""; + $return[] = (isset($params[$val])) ? $val : SQL::current()->escape($val) ; + } return "(".join(", ", $return).")"; } includes/class/QueryBuilder.php @@ -1195,6 +1195,11 @@ array("<![CDATA[", "]]>"), $sane_xml); + if (!substr_count($sane_xml, "xmlns:export")) + $sane_xml = preg_replace("/xmlns:content=\"([^\"]+)\"(\s+)/m", + "xmlns:content=\"\\1\"\\2xmlns:excerpt=\"http://wordpress.org/excerpt/1.0/\"\\2", + $sane_xml); + $fix_amps_count = 1; while ($fix_amps_count) $sane_xml = preg_replace("/<wp:meta_value>(.+)&(?!amp;)(.+)<\/wp:meta_value>/m", @@ -1203,7 +1208,7 @@ $xml = simplexml_load_string($sane_xml, "SimpleXMLElement", LIBXML_NOCDATA); - if (!$xml or !strpos($xml->channel->generator, "wordpress.org")) + if (!$xml or !substr_count($xml->channel->generator, "wordpress.org")) Flash::warning(__("File does not seem to be a valid WordPress export file."), "/admin/?action=import"); includes/controller/Admin.php @@ -7,7 +7,7 @@ * <Model> */ class Page extends Model { - public $belongs_to = array("user", "parent" => "page"); + public $belongs_to = array("user", "parent" => array("model" => "page")); public $has_many = array("children" => array("page", "parent")); includes/model/Page.php @@ -5,7 +5,6 @@ class Comments extends Modules { public function __init() { $this->addAlias("metaWeblog_newPost_preQuery", "metaWeblog_editPost_preQuery"); - $this->addAlias("post_grab", "posts_get"); $this->addAlias("comment_grab", "comments_get"); } @@ -619,6 +618,44 @@ $post->has_many[] = "comments"; } + public function post_comment_count_attr($attr, $post) { + if (isset($this->comment_counts)) + return fallback($this->comment_counts[$post->id], 0); + + $counts = SQL::current()->select("comments", + array("COUNT(post_id) AS total", "post_id"), + null, + null, + null, + null, + null, + "post_id"); + + foreach ($counts->fetchAll() as $count) + $this->comment_counts[$count["post_id"]] = (int) $count["total"]; + + return fallback($this->comment_counts[$post->id], 0); + } + + public function post_latest_comment_attr($attr, $post) { + if (isset($this->latest_comments)) + return fallback($this->latest_comments[$post->id], "0000-00-00 00:00:00"); + + $times = SQL::current()->select("comments", + array("MAX(created_at) AS latest", "post_id"), + null, + null, + null, + null, + null, + "post_id"); + + foreach ($times->fetchAll() as $row) + $this->latest_comments[$row["post_id"]] = $row["latest"]; + + return fallback($this->latest_comments[$post->id], "0000-00-00 00:00:00"); + } + public function comments_get($options) { if (ADMIN) return; @@ -640,30 +677,6 @@ return Comment::user_can($post); } - static function posts_get($options) { - $options["select"][] = "COUNT(comments.id) AS comment_count"; - $options["select"][] = "MAX(comments.created_at) AS latest_comment"; - - $options["left_join"][] = array("table" => "comments", - "where" => array("post_id = posts.id", - "status != 'spam'", - "status != 'denied' OR ( - ( - user_id != 0 AND - user_id = :visitor_id - ) OR ( - id IN ".self::visitor_comments()." - ) - )")); - - $options["params"][":visitor_id"] = Visitor::current()->id; - - $options["group"][] = "id"; - $options["group"][] = "post_attributes.name"; - - return $options; - } - public function cacher_regenerate_posts_triggers($array) { $array = array_merge($array, array("add_comment", "update_comment", "delete_comment")); return $array; modules/comments/comments.php @@ -197,7 +197,7 @@ "user_id"=> $user_id, "created_at" => fallback($created_at, datetime()), "updated_at" => fallback($updated_at, "0000-00-00 00:00:00"))); - $new = new self($sql->latest());; + $new = new self($sql->latest()); Trigger::current()->call("add_comment", $new); return $new; modules/comments/model.Comment.php 7e8768b454fb3d5cf8cda1813524c80002b3584c Alex Suraci i.am@toogeneric.com http://github.com/vito/chyrp/commit/ad0af46a4d2b7b5ec8a63f3ac2962de14b6a0339 ad0af46a4d2b7b5ec8a63f3ac2962de14b6a0339 2008-11-19T19:29:37-08:00 2008-11-19T19:29:37-08:00 * Fixed model object overloading trigger check glitch. * Added a fix for empty SimpleXML objects as a result of empty strings. * Added another preprocessing fix for WordPress' ass-backwards export format. * Fixed wordpress export generator validity check. * Comments module no longer uses left joins, in favor of cached dynamic attribute fetching. bf5026cc9ea2e469fa21fb24eb39639cfaf7acab Alex Suraci i.am@toogeneric.com