bug #70 - error messages on group deletion, warning cleanup

diff --git a/boot.php b/boot.php
index eb70dd8f601775065907f3495e92d95a6817be3c..e06e1574e284edea5ad257585fd51ebe871a8a3f 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -4,7 +4,7 @@ set_time_limit(0);
 ini_set('pcre.backtrack_limit', 250000);
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.979' );
+define ( 'FRIENDIKA_VERSION',      '2.2.981' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1054      );
 

diff --git a/include/auth.php b/include/auth.php
index ec02cd85c05696b6ccce3a965466dee386a955d7..1c430406e9e84328f8d69bac078d0302aa3dafde 100644 (file)
--- a/include/auth.php
+++ b/include/auth.php
@@ -28,7 +28,7 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
                goaway($a->get_baseurl());
        }
 
-       if(x($_SESSION['visitor_id']) && (! x($_SESSION['uid']))) {
+       if(x($_SESSION,'visitor_id') && (! x($_SESSION,'uid'))) {
                $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
                        intval($_SESSION['visitor_id'])
                );

diff --git a/include/template_processor.php b/include/template_processor.php
index d431831cb784fc5733afb5f19fd192ba06160134..efdfbaecb78a73fb61bdf90c4b259015bbfe49c6 100644 (file)
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -128,7 +128,7 @@
                        #$s = str_replace(array("\n","\r"),array("§n§","§r§"),$s);
                        $s = $this->_build_nodes($s);
                        $s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s);
-                       $s = str_replace($this->search,$this->replace,$s);
+                       $s = str_replace($this->search,$this->replace, (string) $s);
                        
                        return $s;
                }

diff --git a/mod/group.php b/mod/group.php
index 4873fc3a31a58e6a75b6f2e61630a7d6b90c35a9..3da633edfe4d87f3552e04fa215fa8ed80e499c4 100644 (file)
--- a/mod/group.php
+++ b/mod/group.php
@@ -92,7 +92,7 @@ function group_content(&$a) {
                                notice( t('Unable to remove group.') . EOL);
                }
                goaway($a->get_baseurl() . '/group');
-               return; // NOTREACHED
+               // NOTREACHED
        }
 
        if(($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) {
@@ -107,7 +107,7 @@ function group_content(&$a) {
        if(($a->argc > 1) && (intval($a->argv[1]))) {
 
                require_once('include/acl_selectors.php');
-               $r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+               $r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d AND `deleted` = 0 LIMIT 1",
                        intval($a->argv[1]),
                        intval(local_user())
                );
@@ -161,6 +161,9 @@ function group_content(&$a) {
 
        }
 
+       if(! isset($group))
+               return;
+
        $o .= '<div id="group-update-wrapper">';
        if($change) 
                $o = '';