Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

3 files changed, 15 insertions, 26 deletions

diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php
index f0b8b76a1..79b7548ce 100644
--- a/Zotlabs/Lib/NativeWikiPage.php
+++ b/Zotlabs/Lib/NativeWikiPage.php
@@ -20,7 +20,7 @@ class NativeWikiPage {
 
 		$sql_extra = item_permissions_sql($channel_id,$observer_hash);
 
-		$r = q("select * from item where resource_type = 'nwikipage' and resource_id = '%s' and uid = %d 
+		$r = q("select * from item where resource_type = 'nwikipage' and resource_id = '%s' and uid = %d and item_hidden = 0
 			$sql_extra group by mid",
 			dbesc($resource_id),
 			intval($channel_id)
@@ -63,7 +63,7 @@ class NativeWikiPage {
 
 		$p = post_activity_item($arr, false, false);
 
-		if($p['success']) {
+		if($p['item_id']) {
 			$page = [ 
 				'rawName'  => $name,
 				'htmlName' => escape_tags($name),
@@ -71,7 +71,7 @@ class NativeWikiPage {
 				'fileName' => urlencode(escape_tags($name)) . Zlib\NativeWikiPage::get_file_ext($w)
 			];
 
-			return array('page' => $page, 'item_id' => $p['post_id'], 'wiki' => $w, 'message' => '', 'success' => true);
+			return array('page' => $page, 'item_id' => $p['item_id'], 'wiki' => $w, 'message' => '', 'success' => true);
 		}
 		return [ 'success' => false, 'message' => t('Wiki page create failed.') ];
 	}
@@ -202,6 +202,7 @@ class NativeWikiPage {
 		$revision      = ((array_key_exists('revision',$arr))      ? $arr['revision']        : (-1));
 
 		$w = Zlib\NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
+
 		if (! $w['wiki']) {
 			return array('content' => null, 'message' => 'Error reading wiki', 'success' => false);
 		}
@@ -385,7 +386,7 @@ class NativeWikiPage {
 			intval($channel_id),
 			dbesc($pageUrlName)
 		);
-	
+
 		if($ic) {
 			foreach($ic as $c) {
 				$ids[] = intval($c['iid']);
@@ -393,9 +394,7 @@ class NativeWikiPage {
 		}
 
 		if($ids) {
-			foreach($ids as $id) {
-				drop_item($id,false);
-			}
+			drop_items($ids);
 			return [ 'success' => true ];
 		}
 
@@ -484,7 +483,6 @@ class NativeWikiPage {
 		}
 
 		$w = Zlib\NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
-
 		if (! $w['wiki']) {
 			return array('message' => t('Error reading wiki'), 'success' => false);
 		}
@@ -646,4 +644,4 @@ class NativeWikiPage {
 	  return $o;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php
index 222c10155..d694a28ae 100644
--- a/Zotlabs/Module/Wiki.php
+++ b/Zotlabs/Module/Wiki.php
@@ -416,7 +416,7 @@ class Wiki extends \Zotlabs\Web\Controller {
 			}
 			$page = Zlib\NativeWikiPage::create_page($owner['channel_id'],$observer_hash, $name, $resource_id);
 
-			if($page['success']) {
+			if($page['item_id']) {
 				$ob = \App::get_observer();
 				$commit = Zlib\NativeWikiPage::commit(array(
 					'commit_msg'    => t('New page created'), 
@@ -547,20 +547,8 @@ class Wiki extends \Zotlabs\Web\Controller {
 
 			$deleted = Zlib\NativeWikiPage::delete_page(array('channel_id' => $owner['channel_id'], 'observer_hash' => $observer_hash, 'resource_id' => $resource_id, 'pageUrlName' => $pageUrlName));
 			if($deleted['success']) {
-				$ob = \App::get_observer();
-				$commit = Zlib\NativeWikiPage::git_commit(array(
-					'commit_msg' => 'Deleted ' . $pageUrlName, 
-					'resource_id' => $resource_id, 
-					'observer' => $ob,
-					'files' => null
-				));
-				if($commit['success']) {
-					Zlib\NativeWiki::sync_a_wiki_item($owner['channel_id'],$commit['item_id'],$resource_id);
-					json_return_and_die(array('message' => 'Wiki git repo commit made', 'success' => true));
-				}
-				else {
-					json_return_and_die(array('message' => 'Error making git commit','success' => false));					
-				}
+				Zlib\NativeWiki::sync_a_wiki_item($owner['channel_id'],$commit['item_id'],$resource_id);
+				json_return_and_die(array('message' => 'Wiki git repo commit made', 'success' => true));
 			}
 			else {
 				json_return_and_die(array('message' => 'Error deleting page', 'success' => false));					
diff --git a/include/items.php b/include/items.php
index 4813cfb64..5986038bc 100755
--- a/include/items.php
+++ b/include/items.php
@@ -383,15 +383,18 @@ function post_activity_item($arr,$allow_code = false,$deliver = true) {
 	}
 
 	$post = item_store($arr,$allow_code,$deliver);
-	if($post['success'])
+
+	if($post['success']) {
 		$post_id = $post['item_id'];
+		$ret['item_id'] = $post_id;
+	}
 
 	if($post_id && $deliver) {
 		$arr['id'] = $post_id;
 		call_hooks('post_local_end', $arr);
 		Zotlabs\Daemon\Master::Summon(array('Notifier','activity',$post_id));
 		$ret['success'] = true;
-		$ret['item_id'] = $post_id;
+		//$ret['item_id'] = $post_id;
 		$ret['activity'] = $post['item'];
 	}