friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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

pull/1/head
Friendika 2011-05-15 16:36:49 -07:00
parent 45b9bd96ba
commit 730322ee5f
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -4,7 +4,7 @@ set_time_limit(0);
ini_set('pcre.backtrack_limit', 250000); 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 ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1054 ); define ( 'DB_UPDATE_VERSION', 1054 );

2
include/auth.php
View File

@ -28,7 +28,7 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
goaway($a->get_baseurl()); 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", $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
intval($_SESSION['visitor_id']) intval($_SESSION['visitor_id'])
); );

2
include/template_processor.php
View File

@ -128,7 +128,7 @@
#$s = str_replace(array("\n","\r"),array("§n§","§r§"),$s); #$s = str_replace(array("\n","\r"),array("§n§","§r§"),$s);
$s = $this->_build_nodes($s); $s = $this->_build_nodes($s);
$s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $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; return $s;
} }

7
mod/group.php
View File

@ -92,7 +92,7 @@ function group_content(&$a) {
notice( t('Unable to remove group.') . EOL); notice( t('Unable to remove group.') . EOL);
} }
goaway($a->get_baseurl() . '/group'); goaway($a->get_baseurl() . '/group');
return; // NOTREACHED // NOTREACHED
} }
if(($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) { 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]))) { if(($a->argc > 1) && (intval($a->argv[1]))) {
require_once('include/acl_selectors.php'); 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($a->argv[1]),
intval(local_user()) intval(local_user())
); );
@ -161,6 +161,9 @@ function group_content(&$a) {
} }
if(! isset($group))
return;
$o .= '<div id="group-update-wrapper">'; $o .= '<div id="group-update-wrapper">';
if($change) if($change)
$o = ''; $o = '';