Changeset 2911:5434e75ad738 for plugins/aboutConfig/_admin.php

Timestamp:

01/07/15 12:55:08 (11 years ago)

Author:

Dsls

Branch:

twig

Parents:

2715:a87ddf7dbfb5 (diff), 2910:69efb1571e90 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with default

Files:

• plugins/aboutConfig/_admin.php (modified) (1 diff)
• plugins/aboutConfig/_admin.php (modified) (2 diffs)

plugins/aboutConfig/_admin.php

@@ -12 +12 @@
 if (!defined('DC_CONTEXT_ADMIN')) { return; }
 
-$_menu['Plugins']->addItem('about:config','plugin.php?p=aboutConfig','index.php?pf=aboutConfig/icon.png',
-          preg_match('/plugin.php\?p=aboutConfig(&.*)?$/',$_SERVER['REQUEST_URI']),
+$_menu['System']->addItem('about:config',
+     $core->adminurl->get('admin.plugin.aboutConfig'),
+     dcPage::getPF('aboutConfig/icon.png'),
+     preg_match('/'.preg_quote($core->adminurl->get('admin.plugin.aboutConfig')).'(&.*)?$/',$_SERVER['REQUEST_URI']),
           $core->auth->isSuperAdmin());
 
 $core->tpl->getLoader()->addPath(dirname(__FILE__).'/admtpl/','aboutConfig');
-?>

plugins/aboutConfig/_admin.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2013 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -16 +16 @@
      dcPage::getPF('aboutConfig/icon.png'),
      preg_match('/'.preg_quote($core->adminurl->get('admin.plugin.aboutConfig')).'(&.*)?$/',$_SERVER['REQUEST_URI']),
-     $core->auth->isSuperAdmin());
+          $core->auth->isSuperAdmin());
+
+$core->tpl->getLoader()->addPath(dirname(__FILE__).'/admtpl/','aboutConfig');