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
Piwigo · Jul 6, 2006 · 28093b2 · 28093b2
1 parent 73d9794
commit 28093b2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git 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 @@
     '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
@@ -267,18 +267,6 @@
 
 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'] != '')
   {