Error catching on failure & update ChangeLog

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3857 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index 9f4df7b305852325e08856349d994eeac70a79cc..a7788b8714197c18c3aa28adf2a95d17bc78a998 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,10 @@ Version 1.3.2 -- cvs
   - Remove NOOP checks in the POP3 client of mail_fetch to make things more
     compatible and not break things which don't need to be broken.
   - Fix src directory being moved on Windows systems, bugs #586518 #605256 #610676.
+  - This release is compatible with installations that have register_globals set to off.
+  - Do not lose user prefs/sigs/abooks when trying to save to a full disk.
+  - Make the SquirrelMail link on the right top configurable so a provider can point
+    to their own FAQ for example.
 
 Version 1.3.1
 -------------

diff --git a/functions/abook_local_file.php b/functions/abook_local_file.php
index ca6119324ee1d2d844ac176caff591fb76a7488e..8b3198d29bd5709d102d800ab9324bc7f07a82b9 100644 (file)
--- a/functions/abook_local_file.php
+++ b/functions/abook_local_file.php
@@ -150,8 +150,10 @@ class abook_local_file extends addressbook_backend {
         }       
 
         fclose($newfh);
-        copy( $this->filename .'.tmp' , $this->filename);
-        unlink( $this->filename .'.tmp');
+        if (!@copy($this->filename . '.tmp' , $this->filename)) {
+            return $this->set_error($file->filename.':' . _("Unable to update"));
+        }
+        @unlink( $this->filename .'.tmp');
         $this->unlock();
         $this->open(true);
         return true;