harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'dev'

Browse Source 
Some fixes in include/help.php.

See merge request hubzilla/core!1479
This commit is contained in:
M. Dent 2019-01-19 05:21:53 +01:00
commit 39128c34cc
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/help.php
View File

@ -17,7 +17,7 @@ function get_help_fullpath($path,$suffix=null) {
// Determine the language and modify the path accordingly // Determine the language and modify the path accordingly
$x = determine_help_language(); $x = determine_help_language();
$lang = $x['language']; $lang = $x['language'];
$url_idx = ($x['from_url'] ? 1 : 0);
// The English translation is at the root of /doc/. Other languages are in // The English translation is at the root of /doc/. Other languages are in
// subfolders named by the language code such as "de", "es", etc. // subfolders named by the language code such as "de", "es", etc.
if($lang !== 'en') { if($lang !== 'en') {
@ -53,7 +53,6 @@ function get_help_fullpath($path,$suffix=null) {
* @return string|unknown * @return string|unknown
*/ */
function get_help_content($tocpath = false) { function get_help_content($tocpath = false) {
global $lang;
$doctype = 'markdown'; $doctype = 'markdown';
@ -219,7 +218,6 @@ function find_doc_file($s) {
*/ */
function search_doc_files($s) { function search_doc_files($s) {
\App::set_pager_itemspage(60); \App::set_pager_itemspage(60);
$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']), intval(\App::$pager['start'])); $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']), intval(\App::$pager['start']));
@ -351,7 +349,7 @@ function store_doc_file($s) {
$x = item_store_update($item); $x = item_store_update($item);
} }
else { else {
$item['uuid'] = $item_message_id(); $item['uuid'] = item_message_id();
$item['mid'] = $item['parent_mid'] = z_root() . '/item/' . $item['uuid']; $item['mid'] = $item['parent_mid'] = z_root() . '/item/' . $item['uuid'];
$x = item_store($item); $x = item_store($item);
} }