Changeset 2849:97e1b334e54b for plugins/simpleMenu

Timestamp:

12/16/14 11:46:03 (11 years ago)

Author:

Dsls

Branch:

default

Children:

2850:aacd042b1035, 2877:ae86da118440

Message:

Deprecated $core->adminurl->decode, use $core->adminurl->get instead (with urlencode set to false)

Added dcPage::getPF to shortcut plugin file inclusion

Location:

plugins/simpleMenu

Files:

• _admin.php (modified) (3 diffs)
• index.php (modified) (1 diff)

plugins/simpleMenu/_admin.php

@@ -18 +18 @@
      $icons['simpleMenu'] = new ArrayObject(array(__('Simple menu'),
           $core->adminurl->get('admin.plugin.simpleMenu'),
-          $core->adminurl->decode('load.plugin.file',array('pf' => 'simpleMenu/icon.png'))));
+          dcPage::getPF('simpleMenu/icon.png')));
 }
 function simpleMenu_dashboard_favs($core,$favs)
@@ -25 +25 @@
           'title' => __('Simple menu'),
           'url' => $core->adminurl->get('admin.plugin.simpleMenu'),
-          'small-icon' => $core->adminurl->decode('load.plugin.file',array('pf' => 'simpleMenu/icon-small.png')),
-          'large-icon' => $core->adminurl->decode('load.plugin.file',array('pf' => 'simpleMenu/icon.png')),
+          'small-icon' => dcPage::getPF('simpleMenu/icon-small.png'),
+          'large-icon' => dcPage::getPF('simpleMenu/icon.png'),
           'permissions' => 'usage,contentadmin'
      ));
@@ -33 +33 @@
 $_menu['Blog']->addItem(__('Simple menu'),
      $core->adminurl->get('admin.plugin.simpleMenu'),
-     $core->adminurl->decode('load.plugin.file',array('pf' => 'simpleMenu/icon-small.png')),
+     dcPage::getPF('simpleMenu/icon-small.png'),
     preg_match('/'.preg_quote($core->adminurl->get('admin.plugin.simpleMenu')).'(&.*)?$/',$_SERVER['REQUEST_URI']),
     $core->auth->check('usage,contentadmin',$core->blog->id));

plugins/simpleMenu/index.php

@@ -371 +371 @@
                     dcPage::jsLoad('js/jquery/jquery-ui.custom.js').
                     dcPage::jsLoad('js/jquery/jquery.ui.touch-punch.js').
-                    dcPage::jsLoad($core->adminurl->decode('load.plugin.file',array('pf' => 'simpleMenu/simplemenu.js')));
+                    dcPage::jsLoad(dcPage::getPF('simpleMenu/simplemenu.js'));
           }
           echo dcPage::jsConfirmClose('settings','menuitemsappend','additem','menuitems');