refactor: rename and move function to set $JSINFO

This is a more consistent place relative to pageinfo()
dokuwiki · Apr 5, 2018 · 0c39d46 · 0c39d46
1 parent 7bf3190
commit 0c39d46
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/inc/common.php b/inc/common.php
@@ -300,6 +300,23 @@ function pageinfo() {
     return $info;
 }
 
+/**
+ * Initialize and/or fill global $JSINFO with some basic info to be given to javascript
+ */
+function jsinfo() {
+    global $JSINFO, $ID, $INFO, $ACT;
+
+    if (!is_array($JSINFO)) {
+        $JSINFO = [];
+    }
+    //export minimal info to JS, plugins can add more
+    $JSINFO['id']                    = $ID;
+    $JSINFO['namespace']             = (string) $INFO['namespace'];
+    $JSINFO['ACT']                   = act_clean($ACT);
+    $JSINFO['useHeadingNavigation']  = (int) useHeading('navigation');
+    $JSINFO['useHeadingContent']     = (int) useHeading('content');
+}
+
 /**
  * Return information about the current media item as an associative array.
  *

diff --git a/inc/template.php b/inc/template.php
@@ -328,7 +328,7 @@ function tpl_metaheaders($alt = true) {
     if($conf['useacl'] && $INPUT->server->str('REMOTE_USER')) {
         $script .= "var SIG='".toolbar_signature()."';";
     }
-    _tpl_ensureJSINFO();
+    jsinfo();
     $script .= 'var JSINFO = ' . json_encode($JSINFO).';';
     $head['script'][] = array('type'=> 'text/javascript', '_data'=> $script);
 
@@ -351,20 +351,6 @@ function tpl_metaheaders($alt = true) {
     return true;
 }
 
-function _tpl_ensureJSINFO() {
-    global $JSINFO, $ID, $INFO, $ACT;
-
-    if (!is_array($JSINFO)) {
-        $JSINFO = [];
-    }
-    //export minimal info to JS, plugins can add more
-    $JSINFO['id']                    = $ID;
-    $JSINFO['namespace']             = (string) $INFO['namespace'];
-    $JSINFO['ACT']                   = act_clean($ACT);
-    $JSINFO['useHeadingNavigation']  = (int) useHeading('navigation');
-    $JSINFO['useHeadingContent']     = (int) useHeading('content');
-}
-
 /**
  * prints the array build by tpl_metaheaders
  *