Changeset 2710:f99841305743 for admin/categories.php

Timestamp:

05/15/14 08:38:23 (11 years ago)

Author:

Dsls

Branch:

default

Parents:

2706:c7f1c1418fbf (diff), 2709:d70f7e2cb2c9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with 2.6

Files:

• admin/categories.php (modified) (1 diff)
• admin/categories.php (modified) (1 diff)

admin/categories.php

@@ -73 +73 @@
 
      foreach ($categories as $category) {
-          if (!empty($category->item_id)) {
+          if (!empty($category->item_id) && !empty($category->left) && !empty($category->right)) {
                $core->blog->updCategoryPosition($category->item_id, $category->left, $category->right);
           }

admin/categories.php

@@ -109 +109 @@
      && $rs->count()>1) {
           $starting_script .= dcPage::jsLoad('js/jquery/jquery-ui.custom.js');
+          $starting_script .= dcPage::jsLoad('js/jquery/jquery.ui.touch-punch.js');
           $starting_script .= dcPage::jsLoad('js/jquery/jquery.mjs.nestedSortable.js');
 }