aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-05-15 16:36:49 -0700
committerFriendika <info@friendika.com>2011-05-15 16:36:49 -0700
commit730322ee5fd1b04a026ce6d0bafae9079f307a4b (patch)
tree45dfb0056abb56fe3fafd3184cdd358761e78166
parent45b9bd96baa12c426b1a0a629e81908a59f149d9 (diff)
downloadvolse-hubzilla-730322ee5fd1b04a026ce6d0bafae9079f307a4b.tar.gz
volse-hubzilla-730322ee5fd1b04a026ce6d0bafae9079f307a4b.tar.bz2
volse-hubzilla-730322ee5fd1b04a026ce6d0bafae9079f307a4b.zip
bug #70 - error messages on group deletion, warning cleanup
-rw-r--r--boot.php2
-rw-r--r--include/auth.php2
-rw-r--r--include/template_processor.php2
-rw-r--r--mod/group.php7
4 files changed, 8 insertions, 5 deletions
diff --git a/boot.php b/boot.php
index eb70dd8f6..e06e1574e 100644
--- 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 ec02cd85c..1c430406e 100644
--- 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 d431831cb..efdfbaecb 100644
--- 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 4873fc3a3..3da633edf 100644
--- 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 = '';