Merge branch 'macnibblet/hotfix/feed-strategy'

PR #1741
zendframework · Jul 4, 2012 · f8e8120 · f8e8120
2 parents d71b9ff + c8d0e3a
commit f8e8120
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/library/Zend/View/Model/FeedModel.php b/library/Zend/View/Model/FeedModel.php
@@ -45,6 +45,16 @@ class FeedModel extends ViewModel
      */
     protected $type = false;
 
+    /**
+     * A feed is always terminal
+     *
+     * @var bool
+     */
+    protected $terminate = true;
+
+    /**
+     * @return \Zend\Feed\Writer\Feed
+     */
     public function getFeed()
     {
         if ($this->feed instanceof Feed) {
@@ -67,8 +77,8 @@ public function getFeed()
 
     /**
      * Set the feed object
-     * 
-     * @param  Feed $feed 
+     *
+     * @param  Feed $feed
      * @return FeedModel
      */
     public function setFeed(Feed $feed)
@@ -79,7 +89,7 @@ public function setFeed(Feed $feed)
 
     /**
      * Get the feed type
-     * 
+     *
      * @return false|string
      */
     public function getFeedType()

diff --git a/library/Zend/View/Strategy/FeedStrategy.php b/library/Zend/View/Strategy/FeedStrategy.php
@@ -162,10 +162,20 @@ public function injectResponse(ViewEvent $e)
                   ? 'application/rss+xml'
                   : 'application/atom+xml';
 
+        $model   = $e->getModel();
+        $charset = '';
+
+        if ($model instanceof Model\FeedModel) {
+
+            $feed = $model->getFeed();
+
+            $charset = '; charset=' . $feed->getEncoding() . ';';
+        }
+
         // Populate response
         $response = $e->getResponse();
         $response->setContent($result);
         $headers = $response->getHeaders();
-        $headers->addHeaderLine('content-type', $feedType);
+        $headers->addHeaderLine('content-type', $feedType . $charset);
     }
 }
diff --git a/tests/Zend/Search/Lucene/_files/.gitignore b/tests/Zend/Search/Lucene/_files/.gitignore
@@ -1 +1,2 @@
-*
+*.sti
+*.lock*