diff options
| author | Friendika <info@friendika.com> | 2011-05-15 16:36:49 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-05-15 16:36:49 -0700 |
| commit | 730322ee5fd1b04a026ce6d0bafae9079f307a4b (patch) | |
| tree | 45dfb0056abb56fe3fafd3184cdd358761e78166 /include | |
| parent | 45b9bd96baa12c426b1a0a629e81908a59f149d9 (diff) | |
| download | volse-hubzilla-730322ee5fd1b04a026ce6d0bafae9079f307a4b.tar.gz volse-hubzilla-730322ee5fd1b04a026ce6d0bafae9079f307a4b.tar.bz2 volse-hubzilla-730322ee5fd1b04a026ce6d0bafae9079f307a4b.zip | |
bug #70 - error messages on group deletion, warning cleanup
Diffstat (limited to 'include')
| -rw-r--r-- | include/auth.php | 2 | ||||
| -rw-r--r-- | include/template_processor.php | 2 |
2 files changed, 2 insertions, 2 deletions
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; } |