Merge branch 'dev' into 'dev'
Some fixes in include/help.php. See merge request hubzilla/core!1479
This commit is contained in:
commit
39128c34cc
@ -17,7 +17,7 @@ function get_help_fullpath($path,$suffix=null) {
|
||||
// Determine the language and modify the path accordingly
|
||||
$x = determine_help_language();
|
||||
$lang = $x['language'];
|
||||
$url_idx = ($x['from_url'] ? 1 : 0);
|
||||
|
||||
// The English translation is at the root of /doc/. Other languages are in
|
||||
// subfolders named by the language code such as "de", "es", etc.
|
||||
if($lang !== 'en') {
|
||||
@ -53,7 +53,6 @@ function get_help_fullpath($path,$suffix=null) {
|
||||
* @return string|unknown
|
||||
*/
|
||||
function get_help_content($tocpath = false) {
|
||||
global $lang;
|
||||
|
||||
$doctype = 'markdown';
|
||||
|
||||
@ -219,7 +218,6 @@ function find_doc_file($s) {
|
||||
*/
|
||||
function search_doc_files($s) {
|
||||
|
||||
|
||||
\App::set_pager_itemspage(60);
|
||||
$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);
|
||||
}
|
||||
else {
|
||||
$item['uuid'] = $item_message_id();
|
||||
$item['uuid'] = item_message_id();
|
||||
$item['mid'] = $item['parent_mid'] = z_root() . '/item/' . $item['uuid'];
|
||||
$x = item_store($item);
|
||||
}
|
||||
|
Reference in New Issue
Block a user