Changeset 522 for trunk

Timestamp:

04/16/08 13:00:34 (8 months ago)

Author:

sidtheduck

Message:

Fix for ticket #149 - conditionals to keep '@' error suppression from failing on some systems and stopping the script

Location:

trunk

Files:

• admin/plog-admin-functions.php (modified) (1 diff)
• plog-functions.php (modified) (1 diff)

trunk/admin/plog-admin-functions.php

@@ -97 +97 @@
         };
 
-        @unlink($tmpname);
+        if (is_file($tmpname)){
+                unlink($tmpname);
+        }
         $res = chmod($final_fqfn, 0755);
 

trunk/plog-functions.php

@@ -512 +512 @@
         // if thumbnail file already exists and is generated after data for a thumbnail type
         // has been changed, then we assume that the thumbnail is valid.
-        $thumbnail_timestamp = @filemtime($thumbpath);
-        
-        if (file_exists($thumbpath) && $thumb_config['timestamp'] < $thumbnail_timestamp) {
-                return $thumburl;
+        if (file_exists($thumbpath){
+                $thumbnail_timestamp = @filemtime($thumbpath);
+                if ($thumb_config['timestamp'] < $thumbnail_timestamp) {
+                        return $thumburl;
+                }
         }