Merge branch 'master' of https://github.com/Yousha/zf2 into release

zendframework · Sep 13, 2012 · 41b2dc0 · 41b2dc0
commit 41b2dc0
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/Paginator.php b/src/Paginator.php
@@ -828,9 +828,8 @@ public function toJson()
 
         if ($currentItems instanceof DbAbstractRowset) {
             return Json::encode($currentItems->toArray());
-        } else {
-            return Json::encode($currentItems);
         }
+        return Json::encode($currentItems);
     }
 
     /**