Changeset 3691:3dbfcef11299 for plugins

Timestamp:

01/31/18 12:11:05 (8 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

PHP 7.2 compliance (deprecated create_function() replaced by closure)

Location:

plugins

Files:

• dcCKEditor/_admin.php (modified) (2 diffs)
• dcLegacyEditor/_admin.php (modified) (2 diffs)

plugins/dcCKEditor/_admin.php

@@ -11 +11 @@
 # -- END LICENSE BLOCK -----------------------------------------
 
-if (!defined('DC_CONTEXT_ADMIN')) { return; }
+if (!defined('DC_CONTEXT_ADMIN')) {return;}
 
 $_menu['Plugins']->addItem('dcCKEditor',
-     $core->adminurl->get('admin.plugin.dcCKEditor'),
-     dcPage::getPF('dcCKEditor/imgs/icon.png'),
-     preg_match('/'.preg_quote($core->adminurl->get('admin.plugin.dcCKEditor')).'(&.*)?$/', $_SERVER['REQUEST_URI']),
-     $core->auth->check('admin,contentadmin', $core->blog->id)
+    $core->adminurl->get('admin.plugin.dcCKEditor'),
+    dcPage::getPF('dcCKEditor/imgs/icon.png'),
+    preg_match('/' . preg_quote($core->adminurl->get('admin.plugin.dcCKEditor')) . '(&.*)?$/', $_SERVER['REQUEST_URI']),
+    $core->auth->check('admin,contentadmin', $core->blog->id)
 );
 
@@ -23 +23 @@
 
 if ($self_ns->active) {
-    $core->addEditorFormater('dcCKEditor','xhtml',create_function('$s','return $s;'));
+    $core->addEditorFormater('dcCKEditor', 'xhtml', function ($s) {return $s;});
 
-    $core->addBehavior('adminPostEditor',array('dcCKEditorBehaviors','adminPostEditor'));
-    $core->addBehavior('adminPopupMedia',array('dcCKEditorBehaviors','adminPopupMedia'));
-    $core->addBehavior('adminPopupLink',array('dcCKEditorBehaviors','adminPopupLink'));
-    $core->addBehavior('adminPopupPosts',array('dcCKEditorBehaviors','adminPopupPosts'));
+    $core->addBehavior('adminPostEditor', array('dcCKEditorBehaviors', 'adminPostEditor'));
+    $core->addBehavior('adminPopupMedia', array('dcCKEditorBehaviors', 'adminPopupMedia'));
+    $core->addBehavior('adminPopupLink', array('dcCKEditorBehaviors', 'adminPopupLink'));
+    $core->addBehavior('adminPopupPosts', array('dcCKEditorBehaviors', 'adminPopupPosts'));
 
-    $core->addBehavior('adminMediaURL',array('dcCKEditorBehaviors','adminMediaURL'));
+    $core->addBehavior('adminMediaURL', array('dcCKEditorBehaviors', 'adminMediaURL'));
 }

plugins/dcLegacyEditor/_admin.php

@@ -11 +11 @@
 # -- END LICENSE BLOCK -----------------------------------------
 
-if (!defined('DC_CONTEXT_ADMIN')) { return; }
+if (!defined('DC_CONTEXT_ADMIN')) {return;}
 
 $_menu['Plugins']->addItem('dcLegacyEditor',
-     $core->adminurl->get('admin.plugin.dcLegacyEditor'),
-     dcPage::getPF('dcLegacyEditor/icon.png'),
-     preg_match('/'.preg_quote($core->adminurl->get('admin.plugin.dcLegacyEditor')).'/', $_SERVER['REQUEST_URI']),
-     $core->auth->check('admin,contentadmin', $core->blog->id)
+    $core->adminurl->get('admin.plugin.dcLegacyEditor'),
+    dcPage::getPF('dcLegacyEditor/icon.png'),
+    preg_match('/' . preg_quote($core->adminurl->get('admin.plugin.dcLegacyEditor')) . '/', $_SERVER['REQUEST_URI']),
+    $core->auth->check('admin,contentadmin', $core->blog->id)
 );
 
@@ -24 +24 @@
 if ($self_ns->active) {
     if (!($core->wiki2xhtml instanceof wiki2xhtml)) {
-          $core->initWikiPost();
-     }
+        $core->initWikiPost();
+    }
 
-     $core->addEditorFormater('dcLegacyEditor','xhtml',create_function('$s','return $s;'));
-     $core->addEditorFormater('dcLegacyEditor','wiki',array($core->wiki2xhtml,'transform'));
+    $core->addEditorFormater('dcLegacyEditor', 'xhtml', function ($s) {return $s;});
+    $core->addEditorFormater('dcLegacyEditor', 'wiki', array($core->wiki2xhtml, 'transform'));
 
-     $core->addBehavior('adminPostEditor',array('dcLegacyEditorBehaviors','adminPostEditor'));
-     $core->addBehavior('adminPopupMedia',array('dcLegacyEditorBehaviors','adminPopupMedia'));
-     $core->addBehavior('adminPopupLink',array('dcLegacyEditorBehaviors','adminPopupLink'));
-     $core->addBehavior('adminPopupPosts',array('dcLegacyEditorBehaviors','adminPopupPosts'));
+    $core->addBehavior('adminPostEditor', array('dcLegacyEditorBehaviors', 'adminPostEditor'));
+    $core->addBehavior('adminPopupMedia', array('dcLegacyEditorBehaviors', 'adminPopupMedia'));
+    $core->addBehavior('adminPopupLink', array('dcLegacyEditorBehaviors', 'adminPopupLink'));
+    $core->addBehavior('adminPopupPosts', array('dcLegacyEditorBehaviors', 'adminPopupPosts'));
 }