Skip to content

armgit / Vvveb

Public Imported from GitHub
0

Powerful and easy to use cms to build websites, blogs or ecommerce stores.

Menu item recursive delete fallback to non recursive for older mysql versions

givanzafd11a0d1c35
diff --git a/admin/controller/content/menus.php b/admin/controller/content/menus.php
index 871a926..fe2dd0a 100755
--- a/admin/controller/content/menus.php
+++ b/admin/controller/content/menus.php
@@ -60,7 +60,15 @@ class Menus extends Categories {
$view = $this->view;
$menus = new menuSQL();
- if ($menu_item_id && ($result = $menus->deleteMenuItem(['menu_item_id' => $menu_item_id]))) {
+ if ($menu_item_id) {
+ try {
+ //will fail on mysql 5
+ $result = $menus->deleteMenuItemRecursive(['menu_item_id' => $menu_item_id]);
+ } catch (\Exception $ex) {
+ //older mysql versions don't have recursive CTE
+ $result = $menus->deleteMenuItem(['menu_item_id' => $menu_item_id]);
+ }
+
if ($result['menu_item'] > 0) {
$success = __('Item deleted!');
} else {
@@ -183,8 +191,9 @@ class Menus extends Categories {
if (! $id) {
$view->errors = [$menu->error];
} else {
- $view->success[] = __('Menu saved!');
- $this->redirect(['module'=>'content/menus', 'action' => 'menu', 'menu_id' => $id]);
+ $success = __('Menu saved!');
+ $view->success[] = $success;
+ $this->redirect(['module'=>'content/menus', 'action' => 'menu', 'menu_id' => $id, 'success' => $success]);
}
}
}