aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-04-05 16:59:32 +0200
committerMario Vavti <mario@mariovavti.com>2016-04-05 16:59:32 +0200
commitbd29551f9aec4c463c02a3c57a5d6d94c9ee318d (patch)
treef34dea11108514d26b674775bc5e756c17a33db0
parent32ccdd1f57dc036b9917c9f5577d0ef4298d959c (diff)
downloadvolse-hubzilla-bd29551f9aec4c463c02a3c57a5d6d94c9ee318d.tar.gz
volse-hubzilla-bd29551f9aec4c463c02a3c57a5d6d94c9ee318d.tar.bz2
volse-hubzilla-bd29551f9aec4c463c02a3c57a5d6d94c9ee318d.zip
fix contextual help
-rw-r--r--include/nav.php5
-rw-r--r--view/js/autocomplete.js2
2 files changed, 3 insertions, 4 deletions
diff --git a/include/nav.php b/include/nav.php
index 4bcef4425..e8c1a2e92 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -151,8 +151,8 @@ EOT;
if(! get_config('system','hide_help')) {
require_once('mod/help.php');
- $context_help = load_doc_file('doc/context/' . $a->cmd . '/help.html');
- $parentdir = dirname($a->cmd);
+ $context_help = load_doc_file('doc/context/' . App::$cmd . '/help.html');
+ $parentdir = dirname(App::$cmd);
while (! $context_help && $parentdir !== '.') {
$context_help = load_doc_file('doc/context/' . $parentdir . '/help.html');
$parentdir = dirname($parentdir);
@@ -266,7 +266,6 @@ $powered_by = '';
*
*/
function nav_set_selected($item){
- $a = get_app();
App::$nav_sel = array(
'community' => null,
'network' => null,
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index a990ad187..b4879d464 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -202,7 +202,7 @@ function submit_form(e) {
$.fn.bbco_autocomplete = function(type) {
if(type=='bbcode') {
- var open_close_elements = ['b', 'i', 'u', 's', 'quote', 'code', 'spoiler', 'map', 'nobb', 'list', 'ul', 'ol', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'zrl', 'zmg', 'rpost', 'qr', 'observer',];
+ var open_close_elements = ['b', 'i', 'u', 's', 'quote', 'code', 'spoiler', 'map', 'nobb', 'list', 'ul', 'ol', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'zrl', 'zmg', 'rpost', 'qr', 'observer'];
var open_elements = ['observer.baseurl', 'observer.address', 'observer.photo', 'observer.name', 'observer.webname', 'observer.url', '*', 'hr', ];
var elements = open_close_elements.concat(open_elements);