Commit 2817ddf971c8f4ddcf549152a531553dfffa0cc7
1 parent
6660281f
folderCount is now returned as an integer, not an array.
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4233 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
1 changed file
with
2 additions
and
5 deletions
lib/browse/DocumentCollection.inc.php
| @@ -97,8 +97,6 @@ class DocumentCollection { | @@ -97,8 +97,6 @@ class DocumentCollection { | ||
| 97 | // we get back strings of numbers. | 97 | // we get back strings of numbers. |
| 98 | $this->folderCount = $this->_queryObj->getFolderCount(); | 98 | $this->folderCount = $this->_queryObj->getFolderCount(); |
| 99 | 99 | ||
| 100 | - | ||
| 101 | - $this->folderCount = $this->folderCount[0]; // sigh. | ||
| 102 | $this->documentCount = $this->_queryObj->getDocumentCount(); | 100 | $this->documentCount = $this->_queryObj->getDocumentCount(); |
| 103 | $this->documentCount = $this->documentCount[0]; | 101 | $this->documentCount = $this->documentCount[0]; |
| 104 | $this->itemCount = $this->documentCount + $this->folderCount; | 102 | $this->itemCount = $this->documentCount + $this->folderCount; |
| @@ -136,8 +134,7 @@ class DocumentCollection { | @@ -136,8 +134,7 @@ class DocumentCollection { | ||
| 136 | } | 134 | } |
| 137 | 135 | ||
| 138 | } | 136 | } |
| 139 | - | ||
| 140 | - | 137 | + |
| 141 | $this->activeset = array( | 138 | $this->activeset = array( |
| 142 | "folders" => $folderSet, | 139 | "folders" => $folderSet, |
| 143 | "documents" => $documentSet, | 140 | "documents" => $documentSet, |
| @@ -212,4 +209,4 @@ class DocumentCollection { | @@ -212,4 +209,4 @@ class DocumentCollection { | ||
| 212 | } | 209 | } |
| 213 | } | 210 | } |
| 214 | 211 | ||
| 215 | -?> | ||
| 216 | \ No newline at end of file | 212 | \ No newline at end of file |
| 213 | +?> |