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

2 files changed, 13 insertions, 1 deletions

diff --git a/include/help.php b/include/help.php
index ef6b77e12..02c3cb8e4 100644
--- a/include/help.php
+++ b/include/help.php
@@ -28,16 +28,22 @@ function get_help_content($tocpath = false) {
 	}
 
 	if($path) {
+		
 		$title = basename($path);
 		if(! $tocpath)
 			\App::$page['title'] = t('Help:') . ' ' . ucwords(str_replace('-',' ',notags($title)));
 
+		// Check that there is a "toc" or "sitetoc" located at the specified path.
+		// If there is not, then there was not a translation of the table of contents
+		// available and so default back to the English TOC at /doc/toc.{html,bb,md}
+		// TODO: This is incompatible with the hierarchical TOC construction
+		// defined in /Zotlabs/Widget/Helpindex.php.
 		if($tocpath !== false && 
 			load_doc_file('doc/' . $path . '.md') === '' && 
 			load_doc_file('doc/' . $path . '.bb') === '' && 
 			load_doc_file('doc/' . $path . '.html') === '' 
 		  ) {
-			$path = 'toc';
+			$path = $title;
 		}
 		$text = load_doc_file('doc/' . $path . '.md');
 
diff --git a/include/items.php b/include/items.php
index 8489ec162..d10d43687 100755
--- a/include/items.php
+++ b/include/items.php
@@ -182,6 +182,12 @@ function item_normal_search() {
 		and item.item_blocked = 0 ";
 }
 
+function item_normal_update() {
+	return " and item.item_hidden = 0 and item.item_type = 0
+		and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0
+		and item.item_blocked = 0 ";
+}
+
 
 /**
  * @brief