refs #1067 : bugfix - category entry number was incorrect.

-
Needlworks · Jan 21, 2015 · 518f5cd · 518f5cd
1 parent 3fa9c50
commit 518f5cd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/library/model/blog.category.php b/library/model/blog.category.php
@@ -322,7 +322,7 @@ function modifyCategory($blogid, $id, $name, $bodyid) {
 	$pool = DBModel::getInstance();
 	$pool->reset("Categories");
 	$pool->setAlias("Categories","c");
-	$pool->extend("Categories p","left",array("c.parent","eq","p.id"));
+	$pool->extend("Categories p","left",array(array("c.parent","eq","p.id")));
 	$pool->setQualifier("c.blogid","eq",$blogid);
 	$pool->setQualifier("c.id","eq",$id);
 
@@ -561,7 +561,7 @@ function moveCategory($blogid, $id, $direction) {
 	$nextPriority = '';
 	$pool->reset("Categories");
 	$pool->setAlias("Categories","c");
-	$pool->extend("Categories p","left",array("p.id","eq","c.parent"));
+	$pool->extend("Categories p","left",array(array("p.id","eq","c.parent")));
 	$pool->setQualifier("c.id","eq",$id);
 	$pool->setQualifier("c.blogid","eq",$blogid);
 	$row = $pool->getRow("p.id AS parentId, p.priority AS parentPriority, p.parent AS parentParent, c.priority AS myPriority, c.parent AS myParent");

diff --git a/library/view/view.php b/library/view/view.php
@@ -618,7 +618,7 @@ function printTreeView($tree, $selected, $embedJava = false, $xhtml=false) {
 			echo ' <a href="'.$ctx->getProperty('uri.default').'/atom" class="categoryFeed"><span class="text">ATOM</span></a>'.CRLF;
 		echo "<a href=\"", htmlspecialchars($tree['link']), '" class="categoryItem">', htmlspecialchars($tree['label']);
 		if ($skin['showValue'])
-			echo " <span class=\"c_cnt\">({$tree['value']})</span>";
+			echo " <span class=\"c_cnt\">{$tree['value']}</span>";
 		echo "</a>".CRLF;
 		if (sizeof($tree['children']) > 0) {
 			echo '<ul>'.CRLF;
@@ -635,7 +635,7 @@ function printTreeView($tree, $selected, $embedJava = false, $xhtml=false) {
 				echo ' <a href="'.$child['atomlink'].'" class="categoryFeed"><span class="text">ATOM</span></a>'.CRLF;
 			echo "<a href=\"", htmlspecialchars($child['link']), '" class="categoryItem">', htmlspecialchars($child['label']);
 			if ($skin['showValue'])
-				echo " <span class=\"c_cnt\">({$child['value']})</span>";
+				echo " <span class=\"c_cnt\">{$child['value']}</span>";
 			echo "</a>".CRLF;
 
 			if (sizeof($child['children']) > 0) {
@@ -653,7 +653,7 @@ function printTreeView($tree, $selected, $embedJava = false, $xhtml=false) {
 							echo '<a href="'.$leaf['atomlink'].'" class="categoryFeed"><span class="text">ATOM</span></a>'.CRLF;
 						echo "<a href=\"", htmlspecialchars($leaf['link']), '" class="categoryItem">', htmlspecialchars($leaf['label']);
 						if ($skin['showValue'])
-							echo " <span class=\"c_cnt\">({$child['value']})</span>";
+							echo " <span class=\"c_cnt\">{$leaf['value']}</span>";
 						echo "</a>".CRLF;
 						echo "</li>".CRLF;
 					}