Index: branches/unlabeled/unlabeled-1.22.2/core/units/categories/categories_event_handler.php
===================================================================
diff -u -r5627 -r5628
--- branches/unlabeled/unlabeled-1.22.2/core/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 5627)
+++ branches/unlabeled/unlabeled-1.22.2/core/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 5628)
@@ -398,10 +398,7 @@
}
if ($clipboard_data['cut'] || $clipboard_data['copy']) {
- if ($this->Application->RecallVar('PermCache_UpdateRequired')) {
- $this->Application->RemoveVar('PermCache_UpdateRequired');
- $event->redirect = 'categories/cache_updater';
- }
+ $event->redirect = 'categories/cache_updater';
}
}
Index: branches/unlabeled/unlabeled-1.2.2/core/units/general/helpers/recursive_helper.php
===================================================================
diff -u -r5627 -r5628
--- branches/unlabeled/unlabeled-1.2.2/core/units/general/helpers/recursive_helper.php (.../recursive_helper.php) (revision 5627)
+++ branches/unlabeled/unlabeled-1.2.2/core/units/general/helpers/recursive_helper.php (.../recursive_helper.php) (revision 5628)
@@ -78,8 +78,6 @@
SET ParentId = '.$dest_category_id.'
WHERE '.$id_field.' IN ('.implode(',', $category_ids).')';
$this->Conn->Query($sql);
-
- $this->Application->StoreVar('PermCache_UpdateRequired', 1);
}
/**
@@ -92,6 +90,7 @@
$backup_category_id = $this->Application->GetVar('m_cat_id');
// 1. clone category
+ $temp_handler =& $this->Application->recallObject('c_TempHandler', 'kTempTablesHandler');
$temp_handler->BuildTables('c', Array($category_id));
$new_category_id = array_pop( $temp_handler->CloneItems('c', '', Array($category_id)) );
$this->Application->SetVar('m_cat_id', $new_category_id);
@@ -116,8 +115,6 @@
}
// 3. clone items that have current category as primary
- $temp_handler =& $this->Application->recallObject('c_TempHandler', 'kTempTablesHandler');
-
$paste_ids = $this->getCategoryItems($category_id, true);
foreach ($paste_ids as $item_prefix => $resource_ids) {
Index: branches/unlabeled/unlabeled-1.23.2/kernel/admin_templates/catalog.tpl
===================================================================
diff -u -r5624 -r5628
--- branches/unlabeled/unlabeled-1.23.2/kernel/admin_templates/catalog.tpl (.../catalog.tpl) (revision 5624)
+++ branches/unlabeled/unlabeled-1.23.2/kernel/admin_templates/catalog.tpl (.../catalog.tpl) (revision 5628)
@@ -114,9 +114,11 @@
) );
a_toolbar.AddButton( new ToolBarButton('clear_clipboard', '', function() {
- $Catalog.submit_event('c', 'OnClearClipboard', null, function($object) {
- $GridManager.CheckDependencies($object.ActivePrefix);
- } );
+ if (confirm('')) {
+ $Catalog.submit_event('c', 'OnClearClipboard', null, function($object) {
+ $GridManager.CheckDependencies($object.ActivePrefix);
+ } );
+ }
}
) );
Index: branches/unlabeled/unlabeled-1.2.2/kernel/units/general/helpers/recursive_helper.php
===================================================================
diff -u -r5627 -r5628
--- branches/unlabeled/unlabeled-1.2.2/kernel/units/general/helpers/recursive_helper.php (.../recursive_helper.php) (revision 5627)
+++ branches/unlabeled/unlabeled-1.2.2/kernel/units/general/helpers/recursive_helper.php (.../recursive_helper.php) (revision 5628)
@@ -78,8 +78,6 @@
SET ParentId = '.$dest_category_id.'
WHERE '.$id_field.' IN ('.implode(',', $category_ids).')';
$this->Conn->Query($sql);
-
- $this->Application->StoreVar('PermCache_UpdateRequired', 1);
}
/**
@@ -92,6 +90,7 @@
$backup_category_id = $this->Application->GetVar('m_cat_id');
// 1. clone category
+ $temp_handler =& $this->Application->recallObject('c_TempHandler', 'kTempTablesHandler');
$temp_handler->BuildTables('c', Array($category_id));
$new_category_id = array_pop( $temp_handler->CloneItems('c', '', Array($category_id)) );
$this->Application->SetVar('m_cat_id', $new_category_id);
@@ -116,8 +115,6 @@
}
// 3. clone items that have current category as primary
- $temp_handler =& $this->Application->recallObject('c_TempHandler', 'kTempTablesHandler');
-
$paste_ids = $this->getCategoryItems($category_id, true);
foreach ($paste_ids as $item_prefix => $resource_ids) {
Index: branches/unlabeled/unlabeled-1.22.2/kernel/units/categories/categories_event_handler.php
===================================================================
diff -u -r5627 -r5628
--- branches/unlabeled/unlabeled-1.22.2/kernel/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 5627)
+++ branches/unlabeled/unlabeled-1.22.2/kernel/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 5628)
@@ -398,10 +398,7 @@
}
if ($clipboard_data['cut'] || $clipboard_data['copy']) {
- if ($this->Application->RecallVar('PermCache_UpdateRequired')) {
- $this->Application->RemoveVar('PermCache_UpdateRequired');
- $event->redirect = 'categories/cache_updater';
- }
+ $event->redirect = 'categories/cache_updater';
}
}
Index: branches/unlabeled/unlabeled-1.23.2/core/admin_templates/catalog/catalog.tpl
===================================================================
diff -u -r5624 -r5628
--- branches/unlabeled/unlabeled-1.23.2/core/admin_templates/catalog/catalog.tpl (.../catalog.tpl) (revision 5624)
+++ branches/unlabeled/unlabeled-1.23.2/core/admin_templates/catalog/catalog.tpl (.../catalog.tpl) (revision 5628)
@@ -114,9 +114,11 @@
) );
a_toolbar.AddButton( new ToolBarButton('clear_clipboard', '', function() {
- $Catalog.submit_event('c', 'OnClearClipboard', null, function($object) {
- $GridManager.CheckDependencies($object.ActivePrefix);
- } );
+ if (confirm('')) {
+ $Catalog.submit_event('c', 'OnClearClipboard', null, function($object) {
+ $GridManager.CheckDependencies($object.ActivePrefix);
+ } );
+ }
}
) );