Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/tree.tpl
===================================================================
diff -u -r7283 -r7371
--- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/tree.tpl (.../tree.tpl) (revision 7283)
+++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/tree.tpl (.../tree.tpl) (revision 7371)
@@ -1,3 +1,4 @@
+
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/tree.js
===================================================================
diff -u -r7370 -r7371
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/tree.js (.../tree.js) (revision 7370)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/tree.js (.../tree.js) (revision 7371)
@@ -150,7 +150,6 @@
if (this.Children && do_sub && !this.Expanding) {
this.expand();
}
-
}
TreeItem.prototype.hide = function()
@@ -170,7 +169,9 @@
this.Tr.className = "highlighted";
last_hightlighted = this;
last_highlighted_key = this.Key;
- this.expand();
+ if (!this.Expanded) {
+ this.expand();
+ }
}
TreeItem.prototype.expand = function() { this.display() }
@@ -489,7 +490,9 @@
TreeFolder.prototype.expand = function(mode)
{
- if (this.Expanding) return;
+ if (this.Expanding) {
+ return;
+ }
this.Expanding = true;
if (!isset(mode)) mode = 0;
Index: branches/unlabeled/unlabeled-1.68.4/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -r7102 -r7371
--- branches/unlabeled/unlabeled-1.68.4/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 7102)
+++ branches/unlabeled/unlabeled-1.68.4/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 7371)
@@ -1326,7 +1326,7 @@
case 'total':
return $object->NoFilterCount;
case 'from':
- return $object->Offset+1; //0-based
+ return $object->RecordsCount ? $object->Offset+1 : 0; //0-based
case 'to':
return min($object->Offset + $object->PerPage, $object->RecordsCount);
}