diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-07-07 19:24:36 +0200 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-07-07 19:24:36 +0200 |
| commit | 3f9e39a9e3d72681056475fe60b193ef78caf536 (patch) | |
| tree | 0fe9c6bcbcc48ccbcceb0a31a95c10fae7207f28 /include | |
| parent | b51bcba26398a90f9d29d7ced2615a88040a6aac (diff) | |
| parent | 862bfbdd2bc60b201918d02351f2591ccf5aea04 (diff) | |
| download | volse-hubzilla-3f9e39a9e3d72681056475fe60b193ef78caf536.tar.gz volse-hubzilla-3f9e39a9e3d72681056475fe60b193ef78caf536.tar.bz2 volse-hubzilla-3f9e39a9e3d72681056475fe60b193ef78caf536.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include')
| -rwxr-xr-x | include/items.php | 2 | ||||
| -rw-r--r-- | include/nav.php | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/items.php b/include/items.php index 5e584b09c..c067d3c1e 100755 --- a/include/items.php +++ b/include/items.php @@ -4911,6 +4911,8 @@ function update_remote_id($channel,$post_id,$webpage,$pagetitle,$namespace,$remo $page_type = 'BUILDBLOCK'; elseif($webpage == ITEM_TYPE_PDL) $page_type = 'PDL'; + elseif($webpage == ITEM_TYPE_DOC) + $page_type = 'docfile'; elseif($namespace && $remote_id) { $page_type = $namespace; $pagetitle = $remote_id; diff --git a/include/nav.php b/include/nav.php index 0ca554897..898805bba 100644 --- a/include/nav.php +++ b/include/nav.php @@ -157,7 +157,7 @@ EOT; $nav['apps'] = array('apps', t('Apps'), "", t('Applications, utilities, links, games'),'apps_nav_btn'); - $nav['search'] = array('search', t('Search'), "", t('Search site content')); + $nav['search'] = array('search', t('Search'), "", t('Search site @name, #tag, ?docs, content')); $nav['directory'] = array('directory', t('Directory'), "", t('Channel Directory'),'directory_nav_btn'); @@ -244,7 +244,7 @@ $powered_by = ''; '$localuser' => local_channel(), '$sel' => $a->nav_sel, '$powered_by' => $powered_by, - '$help' => t('@name, #tag, content'), + '$help' => t('@name, #tag, ?doc, content'), '$pleasewait' => t('Please wait...') )); |