- deletion : no mail notification anymore. Feature replaced by RSS feed

  notification.

- improvement : on waiting pictures management. Ability to validate all or
  reject all in one clic.

- regrouped fields in admin/update


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

1 files changed, 1 insertions, 6 deletions

diff --git a/upload.php b/upload.php
index 82bcffd2b..39f0db5d2 100644
--- a/upload.php
+++ b/upload.php
@@ -212,11 +212,6 @@ if ( isset( $_POST['submit'] ) and !isset( $_GET['waiting_id'] ) )
     $query.= ';';
     pwg_query( $query );
     $page['waiting_id'] = mysql_insert_id();
-    // mail notification for administrators
-    if ( $conf['mail_notification'] )
-    {
-      notify( 'upload' );
-    }
   }
 }
 
@@ -276,7 +271,7 @@ else
 }
 
 $username = !empty($_POST['username'])?$_POST['username']:$user['username'];
-$mail_address = !empty($_POST['mail_address'])?$_POST['mail_address']:$user['mail_address'];
+$mail_address = !empty($_POST['mail_address'])?$_POST['mail_address']:@$user['mail_address'];
 $name = !empty($_POST['name'])?$_POST['name']:'';
 $author = !empty($_POST['author'])?$_POST['author']:'';
 $date_creation = !empty($_POST['date_creation'])?$_POST['date_creation']:'';