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
This commit is contained in:
plegall 2011-05-25 09:18:32 +00:00
commit ef19a77f6e
7 changed files with 31 additions and 1 deletions

View file

@ -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();