[geeklog-cvs] geeklog: Merged changes from geeklog_1_8_0_1 branch

[geeklog-cvs at lists.geeklog.net]

changeset 8424:43855e522300
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/43855e522300
user: Dirk Haun <dirk at haun-online.de>
date: Sun Sep 25 10:27:45 2011 +0200
description:
Merged changes from geeklog_1_8_0_1 branch

diffstat:

 public_html/admin/user.php      |   8 +++-----
 public_html/docs/history        |  13 +++++++++++++
 system/classes/config.class.php |   4 ++++
 system/lib-story.php            |  12 +++++++++++-
 4 files changed, 31 insertions(+), 6 deletions(-)

diffs (86 lines):

diff -r 43b0964011ba -r 43855e522300 public_html/admin/user.php
--- a/public_html/admin/user.php	Sun Sep 18 18:12:40 2011 +0200
+++ b/public_html/admin/user.php	Sun Sep 25 10:27:45 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;
                 }
diff -r 43b0964011ba -r 43855e522300 public_html/docs/history
--- a/public_html/docs/history	Sun Sep 18 18:12:40 2011 +0200
+++ b/public_html/docs/history	Sun Sep 25 10:27:45 2011 +0200
@@ -9,6 +9,19 @@
 - mysqli class (patch #0001303) [Dirk]
 
 
+Sep ??, 2011 (1.8.1)
+------------
+
+- Fixed deleting elements from Configuration arrays (bug #0001394, patch
+  provided by dengen)
+- Avoid censoring in What's Related block (bug #0001393) [Tom, Dirk]
+- Fixed error message display in admin's user editor when renaming the
+  userphoto failed [Dirk]
+- Don't display details of a failed MS SQL query by default [Dirk]
+
+- Updated Japanese language file, provided by the Geeklog.jp group
+
+
 Sep 11, 2011 (1.8.1rc1)
 ------------
 
diff -r 43b0964011ba -r 43855e522300 system/classes/config.class.php
--- a/system/classes/config.class.php	Sun Sep 18 18:12:40 2011 +0200
+++ b/system/classes/config.class.php	Sun Sep 25 10:27:45 2011 +0200
@@ -1322,6 +1322,10 @@
                 } else if ( is_array($change_array[$param_name]) ) {
                     /* if array such as mail settings */
                     $_changed = false;
+                    if (count($this->config_array[$group][$param_name]) !=
+                            count($change_array[$param_name])) {
+                        $_changed = true;
+                    }
                     foreach ( $change_array[$param_name] as $_param_name => $_param_value ) {
                         if  ( $change_array[$param_name][$_param_name] != 
                               $this->config_array[$group][$param_name][$_param_name] )
diff -r 43b0964011ba -r 43855e522300 system/lib-story.php
--- a/system/lib-story.php	Sun Sep 18 18:12:40 2011 +0200
+++ b/system/lib-story.php	Sun Sep 25 10:27:45 2011 +0200
@@ -596,6 +596,16 @@
         $rel = array ();
     }
 
+    foreach ($rel as &$value) {
+        if (preg_match("/<a[^>]*href=[\"']([^\"']*)[\"'][^>]*>(.*?)<\/a>/i",
+                       $value, $matches) === 1) {
+            $value = '<a href="' . $matches[1] . '">'
+                   . COM_checkWords($matches[2]) . '</a>';
+        } else {
+            $value = COM_checkWords($value);
+        }
+    }
+
     if( !COM_isAnonUser() || (( $_CONF['loginrequired'] == 0 ) &&
            ( $_CONF['searchloginrequired'] == 0 ))) {
         // add a link to "search by author"
@@ -615,7 +625,7 @@
     $related = '';
     if( count( $rel ) > 0 )
     {
-        $related = COM_checkWords( COM_makeList( $rel, 'list-whats-related' ));
+        $related = COM_makeList( $rel, 'list-whats-related' );
     }
 
     return( $related );