(cp 7f00155) fixes #1780 automatically switch to the old album manager

admin/albums.php

@@ -13,6 +13,25 @@ if (!defined('PHPWG_ROOT_PATH'))
 
 include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
 
+$query = '
+SELECT
+    COUNT(*)
+  FROM '.CATEGORIES_TABLE.'
+;';
+list($albums_counter) = pwg_db_fetch_row(pwg_query($query));
+
+if ($albums_counter > $conf['light_album_manager_threshold'])
+{
+  $url = get_root_url().'admin.php?page=cat_list';
+
+  if (isset($_GET['parent_id']))
+  {
+    $url.= '&parent_id='.$_GET['parent_id'];
+  }
+
+  redirect($url);
+}
+
 // +-----------------------------------------------------------------------+
 // | Check Access and exit when user status is not ok                      |
 // +-----------------------------------------------------------------------+

admin/cat_modify.php

@@ -226,7 +226,7 @@ $template->assign(
     'U_ADD_PHOTOS_ALBUM' => $base_url.'photos_add&album='.$category['id'],
     'U_CHILDREN' => $cat_list_url.'&parent_id='.$category['id'],
     'U_HELP' => get_root_url().'admin/popuphelp.php?page=cat_modify',
-    'U_MOVE' => $base_url.'albums#cat-'.$category['id'],
+    'U_MOVE' => $base_url.'albums&parent_id='.$category['id'].'#cat-'.$category['id'],
 
     'F_ACTION' => $form_action,
     )