7 files changed, 9 insertions, 17 deletions
diff --git a/Zotlabs/Widget/Activity.php b/Zotlabs/Widget/Activity.php
index 34e0f67dc..19f7acadb 100644
--- a/Zotlabs/Widget/Activity.php
+++ b/Zotlabs/Widget/Activity.php
@@ -17,7 +17,7 @@ class Activity {
 		$o = '';
 
 		if(is_array($arr) && array_key_exists('limit',$arr))
-			$limit = " limit " . intval($limit) . " ";
+			$limit = " limit " . intval($arr['limit']) . " ";
 		else
 			$limit = '';
 
diff --git a/Zotlabs/Widget/Album.php b/Zotlabs/Widget/Album.php
index 003f6f49d..f1fa69182 100644
--- a/Zotlabs/Widget/Album.php
+++ b/Zotlabs/Widget/Album.php
@@ -94,7 +94,7 @@ class Album {
 
 
 		$tpl = get_markup_template('photo_album.tpl');
-		$o .= replace_macros($tpl, array(
+		return replace_macros($tpl, array(
 			'$photos' => $photos,
 			'$album' => (($title) ? $title : $album),
 			'$album_id' => rand(),
@@ -102,11 +102,9 @@ class Album {
 			'$can_post' => false,
 			'$upload' => array(t('Upload'), z_root() . '/photos/' . \App::$profile['channel_address'] . '/upload/' . bin2hex($album)),
 			'$order' => false,
-			'$upload_form' => $upload_form,
-			'$usage' => $usage_message
+			'$upload_form' => '', // $upload_form,
+			'$usage' => '', // $usage_message
 		));
-
-		return $o;
 	}
 }
 
diff --git a/Zotlabs/Widget/Item.php b/Zotlabs/Widget/Item.php
index 6f943ffdf..3de135cb9 100644
--- a/Zotlabs/Widget/Item.php
+++ b/Zotlabs/Widget/Item.php
@@ -34,7 +34,7 @@ class Item {
 		if($arr['title']) {
 			$r = q("select item.* from item left join iconfig on item.id = iconfig.iid
 				where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s'
-				and iconfig.k = 'WEBPAGE' and item_type = %d $sql_extra $revision limit 1",
+				and iconfig.k = 'WEBPAGE' and item_type = %d $sql_extra limit 1",
 				intval($channel_id),
 				dbesc($arr['title']),
 				intval(ITEM_TYPE_WEBPAGE)
diff --git a/Zotlabs/Widget/Pinned.php b/Zotlabs/Widget/Pinned.php
index 2ba170fe8..be6b98434 100644
--- a/Zotlabs/Widget/Pinned.php
+++ b/Zotlabs/Widget/Pinned.php
@@ -112,8 +112,7 @@ class Pinned {
 				'mids'		 => json_encode([ $midb64 ]),
 				'isevent'	 => $isevent,
 				'attend'	 => $attend,
-				'consensus'	 => $consensus,
-				'conlabels'	 => ($canvote ? $conlabels : []),
+				'conlabels'	 => [],
 				'canvote'	 => $canvote,
 				'linktitle' 	 => sprintf( t('View %s\'s profile - %s'), $profile_name, ($author['xchan_addr'] ? $author['xchan_addr'] : $author['xchan_url']) ),
 				'olinktitle' 	 => sprintf( t('View %s\'s profile - %s'), $owner['xchan_name'], ($owner['xchan_addr'] ? $owner['xchan_addr'] : $owner['xchan_url']) ),
diff --git a/Zotlabs/Widget/Portfolio.php b/Zotlabs/Widget/Portfolio.php
index a06f56e30..bde1c7d6a 100644
--- a/Zotlabs/Widget/Portfolio.php
+++ b/Zotlabs/Widget/Portfolio.php
@@ -103,7 +103,7 @@ class Portfolio {
 
 
 		$tpl = get_markup_template('photo_album_portfolio.tpl');
-		$o .= replace_macros($tpl, array(
+		return replace_macros($tpl, array(
 			'$photos' => $photos,
 			'$mode' => $mode,
 			'$count' => $count,
@@ -113,11 +113,7 @@ class Portfolio {
 			'$can_post' => false,
 			'$upload' => array(t('Upload'), z_root() . '/photos/' . \App::$profile['channel_address'] . '/upload/' . bin2hex($album)),
 			'$order' => false,
-			'$upload_form' => $upload_form,
-			'$usage' => $usage_message
 		));
-
-		return $o;
 	}
 }
 
diff --git a/Zotlabs/Widget/Tagcloud.php b/Zotlabs/Widget/Tagcloud.php
index 00456f24f..efd571576 100644
--- a/Zotlabs/Widget/Tagcloud.php
+++ b/Zotlabs/Widget/Tagcloud.php
@@ -18,8 +18,7 @@ class Tagcloud {
 		$flags = 0;
 		$type = TERM_HASHTAG;
 
-		// @FIXME there exists no $authors variable
-		$r = tagadelic($uid, $count, $authors, $owner, $flags, 0, $type);
+		$r = tagadelic($uid, $count, '', '', $flags, 0, $type);
 
 		// @FIXME this should use a template
 
diff --git a/Zotlabs/Widget/Tasklist.php b/Zotlabs/Widget/Tasklist.php
index 96b70af15..9271269cf 100644
--- a/Zotlabs/Widget/Tasklist.php
+++ b/Zotlabs/Widget/Tasklist.php
@@ -19,7 +19,7 @@ class Tasklist {
 		if(App::$profile_uid !== local_channel())
 			return EMPTY_STR;
 
-		$o .= '<script>var tasksShowAll = 0; $(document).ready(function() { tasksFetch(); $("#tasklist-new-form").submit(function(event) { event.preventDefault(); $.post( "tasks/new", $("#tasklist-new-form").serialize(), function(data) { tasksFetch();  $("#tasklist-new-summary").val(""); } ); return false; } )});</script>';
+		$o = '<script>var tasksShowAll = 0; $(document).ready(function() { tasksFetch(); $("#tasklist-new-form").submit(function(event) { event.preventDefault(); $.post( "tasks/new", $("#tasklist-new-form").serialize(), function(data) { tasksFetch();  $("#tasklist-new-summary").val(""); } ); return false; } )});</script>';
 		$o .= '<script>function taskComplete(id) { $.post("tasks/complete/"+id, function(data) { tasksFetch();}); }
 			function tasksFetch() {
 				$.get("tasks/fetch" + ((tasksShowAll) ? "/all" : ""), function(data) {