merge r11040 from branch 2.2 to trunk

bug 1786 fixed: ability to prefilter the synchronize screen with a specific
album by clicking on the new "Synchronize" icon on album admin page or album
admin list.

This is not the solution proposed by Gotcha (ie a treeview to select the album
on the synchronize screen) but it solves the same problem.



git-svn-id: http://piwigo.org/svn/trunk@11041 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 9 insertions, 1 deletions

diff --git a/admin/site_update.php b/admin/site_update.php
index 6b5ae775b..5b90729b8 100644
--- a/admin/site_update.php
+++ b/admin/site_update.php
@@ -809,8 +809,16 @@ else
       'meta_all'  => false,
       'meta_empty_overrides'  => false,
     );
-
+  
   $cat_selected = array();
+
+  if (isset($_GET['cat_id']))
+  {
+    check_input_parameter('cat_id', $_GET, false, PATTERN_ID);
+
+    $cat_selected = array($_GET['cat_id']);
+    $tpl_introduction['sync'] = 'files';
+  }
 }
 
 $tpl_introduction['privacy_level_options'] = get_privacy_level_options();