[geeklog-cvs] geeklog: Merged HEAD in to keep password_update branch up to date.

[geeklog-cvs at lists.geeklog.net]

changeset 8492:3815f6dbcfc4
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/3815f6dbcfc4
user: vinny
date: Mon Feb 13 22:54:36 2012 -0700
description:
Merged HEAD in to keep password_update branch up to date.

diffstat:

 system/lib-plugins.php |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r b04e162b1868 -r 3815f6dbcfc4 system/lib-plugins.php
--- a/system/lib-plugins.php	Mon Feb 13 22:49:59 2012 -0700
+++ b/system/lib-plugins.php	Mon Feb 13 22:54:36 2012 -0700
@@ -2454,7 +2454,7 @@
     }
 
     if (function_exists('CUSTOM_getBlocks')) {
-       $cust_items .= CUSTOM_getBlocks($side, $topic);
+       $cust_items = CUSTOM_getBlocks($side, $topic);
        if (is_array($cust_items)) {
           $ret = array_merge($ret, $cust_items);
        }