Merge branch 'hotfix/2660'

zendframework · Oct 3, 2012 · 99da700 · 99da700
2 parents 15bdeb0 + 9c0e2a0
commit 99da700
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/library/Zend/View/Strategy/JsonStrategy.php b/library/Zend/View/Strategy/JsonStrategy.php
@@ -112,6 +112,8 @@ public function selectRenderer(ViewEvent $e)
             }
             return $this->renderer;
         }
+
+        return ($model instanceof Model\JsonModel) ? $this->renderer : null;
     }
 
     /**

diff --git a/tests/ZendTest/View/Strategy/JsonStrategyTest.php b/tests/ZendTest/View/Strategy/JsonStrategyTest.php
@@ -63,6 +63,16 @@ public function testJavascriptAcceptHeaderSelectsJsonStrategy()
         $this->assertFalse($result->hasJsonpCallback());
     }
 
+    public function testJsonModelMatchedAcceptHeaderMatchSelectsJsonStrategy()
+    {
+        $this->event->setModel(new JsonModel());
+        $request = new HttpRequest();
+        $request->getHeaders()->addHeaderLine('Accept', '*/*');
+        $this->event->setRequest($request);
+        $result = $this->strategy->selectRenderer($this->event);
+        $this->assertSame($this->renderer, $result);
+    }
+
     public function testJsonModelJavascriptAcceptHeaderSetsJsonpCallback()
     {
         $this->event->setModel(new JsonModel());