Changeset 5127 for trunk/picture.php

Timestamp:

Mar 13, 2010, 6:59:14 AM (14 years ago)

Author:

rvelices

Message:

• fix php warning followed by mysql query fatal error
• don't include a file unless necessary

File:

• trunk/picture.php (modified) (4 diffs)

trunk/picture.php

@@ -26 +26 @@
 include(PHPWG_ROOT_PATH.'include/section_init.inc.php');
 include_once(PHPWG_ROOT_PATH.'include/functions_picture.inc.php');
-include_once(PHPWG_ROOT_PATH.'include/functions_comment.inc.php');
 
 // Check Access and exit when user status is not ok
@@ -68 +67 @@
     access_denied();
   }
-  list($page['image_id'], $page['image_file']) =  $row;
+
+  $page['image_id'] = $row['id'];
+  $page['image_file'] =  $row['file'];
   if ( !isset($page['rank_of'][$page['image_id']]) )
   {// the image can still be non accessible (filter/cat perm) and/or not in the set
@@ -311 +312 @@
     case 'edit_comment' :
     {
+      include_once(PHPWG_ROOT_PATH.'include/functions_comment.inc.php');
       if (isset($_GET['comment_to_edit'])
           and is_numeric($_GET['comment_to_edit'])
-          and (is_admin() || $conf['user_can_edit_comment']))
+          and (is_admin() || $conf['user_can_edit_comment']))
       {
-        if (!empty($_POST['content'])) 
-        {
-          update_user_comment(array('comment_id' => $_GET['comment_to_edit'], 
-                                    'image_id' => $page['image_id'],
-                                    'content' => $_POST['content']),
-                              $_POST['key']
-                              ); 
-          redirect($url_self);
-        } else {
-          $edit_comment = $_GET['comment_to_edit'];
-          break;
-        }
+        if (!empty($_POST['content']))
+        {
+          update_user_comment(array('comment_id' => $_GET['comment_to_edit'],
+                  'image_id' => $page['image_id'],
+                  'content' => $_POST['content']),
+                  $_POST['key']
+                  );
+          redirect($url_self);
+        } else {
+          $edit_comment = $_GET['comment_to_edit'];
+          break;
+        }
       }
     }
     case 'delete_comment' :
     {
+      include_once(PHPWG_ROOT_PATH.'include/functions_comment.inc.php');
       if (isset($_GET['comment_to_delete'])
           and is_numeric($_GET['comment_to_delete'])
           and (is_admin() || $conf['user_can_delete_comment']))
       {
-        delete_user_comment($_GET['comment_to_delete']);
+        delete_user_comment($_GET['comment_to_delete']);
       }
       redirect($url_self);
@@ -341 +344 @@
     case 'validate_comment' :
     {
+      include_once(PHPWG_ROOT_PATH.'include/functions_comment.inc.php');
       if (isset($_GET['comment_to_validate'])
           and is_numeric($_GET['comment_to_validate'])