[geeklog-cvs] geeklog: fixed error message display when renaming the userphoto...

[geeklog-cvs at lists.geeklog.net]

changeset 8419:7aaea8278251
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/7aaea8278251
user: Dirk Haun <dirk at haun-online.de>
date: Sat Sep 24 20:13:35 2011 +0200
description:
fixed error message display when renaming the userphoto failed

diffstat:

 public_html/admin/user.php |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (20 lines):

diff -r ebc5e392726f -r 7aaea8278251 public_html/admin/user.php
--- a/public_html/admin/user.php	Sun Sep 18 10:19:09 2011 +0200
+++ b/public_html/admin/user.php	Sat Sep 24 20:13:35 2011 +0200
@@ -610,13 +610,11 @@
                     $newphoto = preg_replace ('/' . $curusername . '/',
                                               $username, $curphoto, 1);
                     $imgpath = $_CONF['path_images'] . 'userphotos/';
-                    if (rename ($imgpath . $curphoto,
+                    if (@rename ($imgpath . $curphoto,
                                 $imgpath . $newphoto) === false) {
-                        $display = COM_siteHeader ('menu', $LANG28[22]);
-                        $display .= COM_errorLog ('Could not rename userphoto "'
+                        $retval .= COM_errorLog ('Could not rename userphoto "'
                                         . $curphoto . '" to "' . $newphoto . '".');
-                        $display .= COM_siteFooter ();
-                        return $display;
+                        return $retval;
                     }
                     $curphoto = $newphoto;
                 }