- bug fixed on upload : configuration variable $conf['upload_available'] has

  disappeared

- by default, new categories are not "uploadable"

- bug fixed on date displayed from Unix format : trying to find seconds
  while not provided

- bug fixed on admin/waiting template to center submit button


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

1 files changed, 7 insertions, 9 deletions

diff --git a/upload.php b/upload.php
index 286f9e051..df947598e 100644
--- a/upload.php
+++ b/upload.php
@@ -122,15 +122,13 @@ if ( isset( $page['cat'] ) and is_numeric( $page['cat'] ) )
   $page['cat_site_id']    = $result['site_id'];
   $page['cat_name']       = $result['name'];
   $page['cat_uploadable'] = $result['uploadable'];
-if ( $page['cat_site_id'] != 1
-     or !$conf['upload_available']
-     or !$page['cat_uploadable'] )
-{
-  echo '<div style="text-align:center;">'.$lang['upload_forbidden'].'<br />';
-  echo '<a href="'.add_session_id( './category.php' ).'">';
-  echo $lang['thumbnails'].'</a></div>';
-  exit();
-}
+  if ($page['cat_site_id'] != 1 or !$page['cat_uploadable'])
+  {
+    echo '<div style="text-align:center;">'.$lang['upload_forbidden'].'<br />';
+    echo '<a href="'.add_session_id( './category.php' ).'">';
+    echo $lang['thumbnails'].'</a></div>';
+    exit();
+  }
 }
 
 $error = array();