Merge pull request #49 from CatoTH/master

Bugfix for del_config

6 files changed, 17 insertions, 16 deletions

diff --git a/include/config.php b/include/config.php
index 92694f519..2cddda0b8 100755
--- a/include/config.php
+++ b/include/config.php
@@ -162,7 +162,7 @@ function del_config($family,$key) {
 	if(x($a->config[$family],$key))
 		unset($a->config[$family][$key]);
 	$ret = q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
-		dbesc($cat),
+		dbesc($family),
 		dbesc($key)
 	);
 	return $ret;
diff --git a/include/conversation.php b/include/conversation.php
index 3d13a1179..53369cf20 100755
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -232,7 +232,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 
 	$alike = array();
 	$dlike = array();
-	
+	$o = "";
 	
 	// array with html for each thread (parent+comments)
 	$threads = array();
@@ -436,7 +436,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 				}
 				else {
 					// prevent private email from leaking into public conversation
-					if((! $toplevelpost) && (! toplevelprivate) && ($item['private']) && ($profile_owner != local_user()))
+					if((! $toplevelpost) && (! $toplevelprivate) && ($item['private']) && ($profile_owner != local_user()))
 						continue;
 					$comments_seen ++;
 				}	
@@ -641,7 +641,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 				$body = prepare_body($item,true);
 
 				$tmp_item = replace_macros($template,array(
-					'$type' => implode("",array_slice(split("/",$item['verb']),-1)),
+					'$type' => implode("",array_slice(explode("/",$item['verb']),-1)),
 					'$tags' => $tags,
 					'$body' => template_escape($body),
 					'$id' => $item['item_id'],
diff --git a/include/event.php b/include/event.php
index c7669b381..4a9a9a004 100755
--- a/include/event.php
+++ b/include/event.php
@@ -163,7 +163,7 @@ function bbtoevent($s) {
 	if(preg_match("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",$s,$match))
 		$ev['adjust'] = $match[1];
 	$match = '';
-	$ev['nofinish'] = (($ev['start'] && (! $ev['finish'])) ? 1 : 0);
+	$ev['nofinish'] = (($ev['start'] && (!x($ev, 'finish') || !$ev['finish'])) ? 1 : 0);
 	return $ev;
 
 }
diff --git a/include/items.php b/include/items.php
index c461b83b4..7d52571c2 100755
--- a/include/items.php
+++ b/include/items.php
@@ -308,7 +308,7 @@ function get_atom_elements($feed,$item) {
 	if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) {
 		$base = $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
 		foreach($base as $link) {
-			if(! $res['author-avatar']) {
+			if(!x($res, 'author-avatar') || !$res['author-avatar']) {
 				if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar')
 					$res['author-avatar'] = unxmlify($link['attribs']['']['href']);
 			}
@@ -323,7 +323,7 @@ function get_atom_elements($feed,$item) {
 			foreach($base as $link) {
 				if($link['attribs']['']['rel'] === 'alternate' && (! $res['author-link']))
 					$res['author-link'] = unxmlify($link['attribs']['']['href']);
-				if(! $res['author-avatar']) {
+				if(!x($res, 'author-avatar') || !$res['author-avatar']) {
 					if($link['attribs']['']['rel'] === 'avatar' || $link['attribs']['']['rel'] === 'photo')
 						$res['author-avatar'] = unxmlify($link['attribs']['']['href']);
 				}
@@ -503,7 +503,7 @@ function get_atom_elements($feed,$item) {
 		$base = $rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
 
 		foreach($base as $link) {
-			if(! $res['owner-avatar']) {
+			if(!x($res, 'owner-avatar') || !$res['owner-avatar']) {
 				if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar')			
 					$res['owner-avatar'] = unxmlify($link['attribs']['']['href']);
 			}
diff --git a/include/template_processor.php b/include/template_processor.php
index 0d476f0e6..7f270fb4b 100755
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -32,11 +32,12 @@
 	
 			if(is_array($r) && count($r)) {
 				foreach ($r as $k => $v ) {
-					if (is_array($v))
+					if (is_array($v)) {
 						$this->_build_replace($v, "$prefix$k.");
-					
-					$this->search[] =  $prefix . $k;
-					$this->replace[] = $v;
+					} else {
+						$this->search[] =  $prefix . $k;
+						$this->replace[] = $v;
+					}
 				}
 			}
 		} 
@@ -53,7 +54,7 @@
 			$keys = array_map('trim',explode(".",$name));		
 			$val = $this->r;
 			foreach($keys as $k) {
-				$val = $val[$k];
+				$val = (isset($val[$k]) ? $val[$k] : null);
 			}
 			return $val;
 		}
@@ -79,8 +80,8 @@
 			} else {
 				$val = $this->_get_var($args[2]);
 			}
-			list($strue, $sfalse)= preg_split("|{{ *else *}}|", $args[3]);
-			return ($val?$strue:$sfalse);
+			$x = preg_split("|{{ *else *}}|", $args[3]);
+			return ( $val ? $x[0] : (isset($x[1]) ? $x[1] : ""));
 		}
 		
 		/**
diff --git a/include/text.php b/include/text.php
index 0f7d2f731..1f5d4a3e1 100755
--- a/include/text.php
+++ b/include/text.php
@@ -996,7 +996,7 @@ function lang_selector() {
 			}
 			$ll = substr($l,5);
 			$ll = substr($ll,0,strrpos($ll,'/'));
-			$selected = (($ll === $lang && (x($_SESSION['language']))) ? ' selected="selected" ' : '');
+			$selected = (($ll === $lang && (x($_SESSION, 'language'))) ? ' selected="selected" ' : '');
 			$o .= '<option value="' . $ll . '"' . $selected . '>' . $ll . '</option>';
 		}
 	}