Changeset 3913:08b5eeb2d560 for inc

Timestamp:

11/05/18 12:03:26 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Fixes #2289 - global $core missing

Location:

inc

Files:

• admin/lib.dc.page.php (modified) (3 diffs)
• core/class.dc.utils.php (modified) (1 diff)

inc/admin/lib.dc.page.php

@@ -351 +351 @@
     {
         global $core;
+
         $tag = (isset($n['divtag']) && $n['divtag']) ? 'div' : 'p';
         $ts  = '';
@@ -539 +540 @@
     {
         global $core;
+
         $with_home_link = isset($options['home_link']) ? $options['home_link'] : true;
         $hl             = isset($options['hl']) ? $options['hl'] : true;
@@ -748 +750 @@
     public static function jsUtil()
     {
-        return self::jsLoad($core->blog->getPF('util.js'));
+        return self::jsLoad($GLOBALS['core']->blog->getPF('util.js'));
     }
 

inc/core/class.dc.utils.php

@@ -137 +137 @@
     public static function jsJson($id, $vars)
     {
-        // Use dcUtils::jsLoad($core->blog->getPF('util.js')) to use the JS getData() decoder
+        // Use echo dcUtils::jsLoad($core->blog->getPF('util.js')); to use the JS getData() decoder
+        // or echo dcPage::jsUtil(); in admin mode
         $ret = '<script type="application/json" id="' . html::escapeHTML($id) . '-data">' . "\n" .
             json_encode($vars, JSON_HEX_TAG | JSON_UNESCAPED_SLASHES) . "\n" . '</script>';