浏览代码

fixes issue ZF-6397. totalResultsReturned not correct for empty result set.

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@18623 44c647ce-9c0f-0410-b52a-842ac1e357ba
klassicd 16 年之前
父节点
当前提交
7db9b62032
共有 2 个文件被更改,包括 6 次插入1 次删除
  1. 1 1
      library/Zend/Service/Flickr/ResultSet.php
  2. 5 0
      tests/Zend/Service/Flickr/OnlineTest.php

+ 1 - 1
library/Zend/Service/Flickr/ResultSet.php

@@ -99,7 +99,7 @@ class Zend_Service_Flickr_ResultSet implements SeekableIterator
         $perPage = $photos->getAttribute('perpage');
         $total   = $photos->getAttribute('total');
 
-        $this->totalResultsReturned  = ($page == $pages) ? ($total - ($page - 1) * $perPage) : (int) $perPage;
+        $this->totalResultsReturned  = ($page == $pages || $pages == 0) ? ($total - ($page - 1) * $perPage) : (int) $perPage;
         $this->firstResultPosition   = ($page - 1) * $perPage + 1;
         $this->totalResultsAvailable = (int) $total;
 

+ 5 - 0
tests/Zend/Service/Flickr/OnlineTest.php

@@ -209,6 +209,11 @@ class Zend_Service_Flickr_OnlineTest extends PHPUnit_Framework_TestCase
             $dateTakenPrevious = $result->datetaken;
         }
     }
+    
+    function testTotalForEmptyResultSet()
+    {
+    	$this->assertEquals(0, $this->_flickr->tagSearch('zendflickrtesttagnoresults')->totalResults());
+    }
 }
 
 /**