feature 2108 finalize upload removal (php warnings)

git-svn-id: http://piwigo.org/svn/trunk@8652 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Jan 13, 2011 · af6e6b5 · af6e6b5
1 parent fe569ab
commit af6e6b5
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 171 deletions.
diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php
@@ -495,59 +495,4 @@ function get_display_images_count($cat_nb_images, $cat_count_images, $cat_count_
   return $display_text;
 }
 
-/**
- * returns the link of upload menu
- *
- * @param null
- * @return string or null
- */
-function get_upload_menu_link()
-{
-  global $conf, $page, $user;
-
-  $show_link = false;
-  $arg_link = null;
-
-  if (is_autorize_status($conf['upload_user_access']))
-  {
-    if (isset($page['category']) and $page['category']['uploadable'] )
-    {
-      // upload a picture in the category
-      $show_link = true;
-      $arg_link = 'cat='.$page['category']['id'];
-    }
-    else
-    if ($conf['upload_link_everytime'])
-    {
-      // upload a picture in the category
-      $query = '
-SELECT
-  1
-FROM '.CATEGORIES_TABLE.' INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.'
-  ON id = cat_id and user_id = '.$user['id'].'
-WHERE
-  uploadable = \'true\'
-  '.get_sql_condition_FandF
-    (
-      array
-        (
-          'visible_categories' => 'id',
-        ),
-      'AND'
-    ).'
-LIMIT 1';
-
-      $show_link = pwg_db_num_rows(pwg_query($query)) <> 0;
-    }
-  }
-  if ($show_link)
-  {
-    return get_root_url().'upload.php'.(empty($arg_link) ? '' : '?'.$arg_link);
-  }
-  else
-  {
-    return;
-  }
-}
-
 ?>
diff --git a/include/menubar.inc.php b/include/menubar.inc.php
@@ -105,7 +105,6 @@ function initialize_menu()
       'NB_PICTURE' => $user['nb_total_images'],
       'MENU_CATEGORIES' => get_categories_menu(),
       'U_CATEGORIES' => make_index_url(array('section' => 'categories')),
-      'U_UPLOAD' => get_upload_menu_link()
     );
     $block->template = 'menubar_categories.tpl';
   }

diff --git a/themes/default/template/upload.tpl b/themes/default/template/upload.tpl