merge -r1435 from branch-1_6 to trunk

bug 450: "upload an image" link in menu bar is missing

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

2 files changed, 13 insertions, 13 deletions

diff --git a/include/menubar.inc.php b/include/menubar.inc.php
index 367d3a961..f17144e9b 100755
--- a/include/menubar.inc.php
+++ b/include/menubar.inc.php
@@ -28,7 +28,7 @@
 /**
  * This file is included by the main page to show the menu bar
  *
- */ 
+ */
 $template->set_filenames(
   array(
     'menubar' => 'menubar.tpl',
@@ -300,5 +300,17 @@ $template->assign_block_vars(
     'REL'=> 'rel="nofollow"'
     )
   );
+
+if (isset($page['category']) and $page['cat_uploadable'] )
+{ // upload a picture in the category
+  $url = get_root_url().'upload.php?cat='.$page['category'];
+  $template->assign_block_vars(
+    'upload',
+    array(
+      'U_UPLOAD'=> $url
+      )
+    );
+}
+
 $template->assign_var_from_handle('MENUBAR', 'menubar');
 ?>
diff --git a/index.php b/index.php
index 474543a0d..b1941a717 100644
--- a/index.php
+++ b/index.php
@@ -267,18 +267,6 @@ if (isset($page['cat_nb_images']) and $page['cat_nb_images'] > 0
 
 if (isset($page['category']))
 {
-  // upload a picture in the category
-  if ($page['cat_uploadable'])
-  {
-    $url = get_root_url().'upload.php?cat='.$page['category'];
-    $template->assign_block_vars(
-      'upload',
-      array(
-        'U_UPLOAD'=> $url
-        )
-      );
-  }
-
   // category comment
   if (isset($page['comment']) and $page['comment'] != '')
   {