merge r9988 from trunk to branch 2.2

git-svn-id: http://piwigo.org/svn/branches/2.2@10005 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100 2011-04-03 08:56:44 +00:00
parent 0caa0f33d3
commit ce4017ba48

View file

@ -77,6 +77,8 @@ $relevant_parameters = array_merge($relevant_parameters, $permalinks);
$eligible_templates = array( $eligible_templates = array(
'----------' => 'N/A', '----------' => 'N/A',
'about.tpl' => 'about', 'about.tpl' => 'about',
'comments.tpl' => 'comments',
'comment_list.tpl' => 'comment_list',
'footer.tpl' => 'tail', 'footer.tpl' => 'tail',
'header.tpl' => 'header', 'header.tpl' => 'header',
'identification.tpl' => 'identification', 'identification.tpl' => 'identification',
@ -89,9 +91,11 @@ $eligible_templates = array(
'menubar_menu.tpl' => 'mbMenu', 'menubar_menu.tpl' => 'mbMenu',
'menubar_specials.tpl' => 'mbSpecials', 'menubar_specials.tpl' => 'mbSpecials',
'menubar_tags.tpl' => 'mbTags', 'menubar_tags.tpl' => 'mbTags',
'month_calendar.tpl' => 'month_calendar',
'navigation_bar.tpl' => 'navbar', 'navigation_bar.tpl' => 'navbar',
'nbm.tpl' => 'nbm', 'nbm.tpl' => 'nbm',
'notification.tpl' => 'notification', 'notification.tpl' => 'notification',
'password.tpl' => 'password',
'picture.tpl' => 'picture', 'picture.tpl' => 'picture',
'picture_content.tpl' => 'default_content', 'picture_content.tpl' => 'default_content',
'picture_nav_buttons.tpl' => 'picture_nav_buttons', 'picture_nav_buttons.tpl' => 'picture_nav_buttons',
@ -105,7 +109,7 @@ $eligible_templates = array(
'slideshow.tpl' => 'slideshow', 'slideshow.tpl' => 'slideshow',
'tags.tpl' => 'tags', 'tags.tpl' => 'tags',
'thumbnails.tpl' => 'index_thumbnails', 'thumbnails.tpl' => 'index_thumbnails',
'upload.tpl' => 'upload',); );
$flip_templates = array_flip($eligible_templates); $flip_templates = array_flip($eligible_templates);