0
@@ -2,6 +2,8 @@
0
   /**
0
    * Class: Group
0
    * The Group model.
0
+	 * See Also:
0
+	 *     <Model>
0
    */
0
   class Group extends Model {
0
     public $no_results = false;

0
@@ -2,10 +2,13 @@
0
   /**
0
    * Class: Page
0
    * The Page model.
0
+	 * See Also:
0
+	 *     <Model>
0
    */
0
   class Page extends Model {
0
+		# Boolean: $no_results
0
+		# Was a result found?
0
     public $no_results = false;
0
-		public $id = 0;
0
 
0
     /**
0
      * Function: __construct

0
@@ -2,22 +2,20 @@
0
   /**
0
    * Class: Post
0
    * The Post model.
0
+	 * See Also:
0
+	 *     <Model>
0
    */
0
   class Post extends Model {
0
+		# Boolean: $no_results
0
+		# Was a result found?
0
     public $no_results = false;
0
 
0
-		public $id = 0;
0
-
0
-		/**
0
-		 * String: $private
0
-		 * SQL "where" text for which posts the current user can view.
0
-		 */
0
+		# String: $private
0
+		# SQL "where" text for which posts the current user can view.
0
     static $private;
0
 
0
-	    /**
0
-		 * String: $enabled_feathers
0
-		 * SQL "where" text for each of the feathers. Prevents posts of a disabled Feather from showing.
0
-		 */
0
+		# String: $enabled_feathers
0
+		# SQL "where" text for each of the feathers. Prevents posts of a disabled Feather from showing.
0
     static $enabled_feathers;
0
 
0
     /**
0
@@ -40,8 +38,10 @@
0
       if ($this->no_results)
0
         return;
0
 
0
+			$this->filtered = !isset($options["filter"]) or $options["filter"];
0
       $this->slug =& $this->url;
0
-			$this->parse(!isset($options["filter"]) or $options["filter"]);
0
+
0
+			$this->parse();
0
     }
0
 
0
     /**
0
@@ -409,14 +409,18 @@
0
      * Generates an acceptable Title from the post's excerpt.
0
      *
0
      * Returns:
0
-		 *     $normalized - The post's excerpt. filtered -> tags stripped -> truncated to 75 characters -> normalized.
0
+		 *     The post's excerpt. iltered -> first line -> ftags stripped -> truncated to 75 characters -> normalized.
0
      */
0
     public function title_from_excerpt() {
0
       if ($this->no_results) return false;
0
 
0
       global $feathers;
0
 
0
-			$excerpt = $this->excerpt();
0
+			# Excerpts are likely to have some sort of markup module applied to them;
0
+			# if the current instantiation is not filtered, make one that is.
0
+			$post = ($this->filtered) ? $this : new Post($this->id) ;
0
+
0
+			$excerpt = $post->excerpt();
0
       Trigger::current()->filter($excerpt, "title_from_excerpt");
0
 
0
       $split_lines = explode("\n", $excerpt);
0
@@ -436,8 +440,13 @@
0
     public function title() {
0
       if ($this->no_results) return false;
0
       global $feathers;
0
-			$title = $feathers[$this->feather]->title($this);
0
-			return Trigger::current()->filter($title, "title");
0
+
0
+			# Excerpts are likely to have some sort of markup module applied to them;
0
+			# if the current instantiation is not filtered, make one that is.
0
+			$post = ($this->filtered) ? $this : new Post($this->id) ;
0
+
0
+			$title = $feathers[$this->feather]->title($post);
0
+			return Trigger::current()->filter($title, "title", $post);
0
     }
0
 
0
 
0
@@ -448,8 +457,13 @@
0
     public function excerpt() {
0
       if ($this->no_results) return false;
0
       global $feathers;
0
-			$excerpt = $feathers[$this->feather]->excerpt($this);
0
-			return Trigger::current()->filter($excerpt, "excerpt");
0
+
0
+			# Excerpts are likely to have some sort of markup module applied to them;
0
+			# if the current instantiation is not filtered, make one that is.
0
+			$post = ($this->filtered) ? $this : new Post($this->id) ;
0
+
0
+			$excerpt = $feathers[$this->feather]->excerpt($post);
0
+			return Trigger::current()->filter($excerpt, "excerpt", $post);
0
     }
0
 
0
 
0
@@ -460,7 +474,13 @@
0
     public function feed_content() {
0
       if ($this->no_results) return false;
0
       global $feathers;
0
-			return call_user_func(array($feathers[$this->feather], "feed_content"), $this);
0
+
0
+			# Excerpts are likely to have some sort of markup module applied to them;
0
+			# if the current instantiation is not filtered, make one that is.
0
+			$post = ($this->filtered) ? $this : new Post($this->id) ;
0
+
0
+			$feed_content = $feathers[$this->feather]->feed_content($post);
0
+			return Trigger::current()->filter($feed_content, "feed_content", $post);
0
     }
0
 
0
     /**
0
@@ -500,15 +520,12 @@
0
     /**
0
      * Function: parse
0
      * Parses the passed XML and loads the tags and values into <Post>.
0
-		 *
0
-		 * Parameters:
0
-		 *     $filter - Should the data be run through any triggers?
0
      */
0
-		private function parse($filter = false) {
0
+		private function parse() {
0
       foreach (self::xml2arr(simplexml_load_string($this->xml)) as $key => $val)
0
         $this->$key = codepoint2name($val);
0
 
0
-			if (!$filter)
0
+			if (!$this->filtered)
0
         return;
0
 
0
       $class = camelize($this->feather);

0
@@ -2,10 +2,13 @@
0
   /**
0
    * Class: User
0
    * The User model.
0
+	 * See Also:
0
+	 *     <Model>
0
    */
0
   class User extends Model {
0
+		# Boolean: $no_results
0
+		# Was a result found?
0
     public $no_results = false;
0
-		public $can = array();
0
 
0
     /**
0
      * Function: __construct

0
@@ -2,6 +2,8 @@
0
   /**
0
    * Class: Visitor
0
    * The model for the currently browsing <User>. Group falls back to whatever group is set as the "Guest Group".
0
+	 * See Also:
0
+	 *     <User>
0
    */
0
   class Visitor extends User {
0
     public $id = 0;

0
@@ -1,7 +1,7 @@
0
 {% extends "content/post.twig" %}
0
 
0
 {% block content %}
0
-{% if post.title %}
0
+{% if post['title'] %}
0
             <h1>
0
               <a href="$post.url" rel="bookmark" title="${ "Permanent Link to" | translate } &quot;$post.title&quot;">$post.title</a>
0
             </h1>

0
@@ -1,7 +1,7 @@
0
 {% extends "content/post.twig" %}
0
 
0
 {% block content %}
0
-{% if post.title %}
0
+{% if post['title'] %}
0
             <h1>
0
               <a href="$post.url" rel="bookmark" title="${ "Permanent Link to" | translate } &quot;$post.title&quot;">$post.title</a>
0
             </h1>