mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Fixed deprecated /e modifier with PHP >= 5.5 in nl2br plugin restore method

Browse Source
This commit is contained in:
Ian
2013-09-01 14:09:28 +02:00
parent 1f8dc86e76
commit 74e699e560
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/serendipity_event_nl2br/serendipity_event_nl2br.php
View File

@ -1,5 +1,6 @@
<?php # $Id$
# serendipity_event_nl2br.php 2012-04-21 16:11:00 ian $
<?php #
# serendipity_event_nl2br.php 2013-08-28 Ian $
@serendipity_plugin_api::load_language(dirname(__FILE__));
@ -15,7 +16,7 @@ class serendipity_event_nl2br extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_NL2BR_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Serendipity Team');
$propbag->add('version', '2.16');
$propbag->add('version', '2.17');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@ -153,7 +154,15 @@ class serendipity_event_nl2br extends serendipity_event
function restore($text) {
global $_buf;
return preg_replace('~\001(\d+)~e', '$_buf[$1]', $text);
// Define our callback here and import $_buf into its scope ...
if (version_compare(PHP_VERSION, '5.4') >= 0) {
// As of PHP 5.5 deprecated /e modifier we define our callback here and import $_buf into its scope ...
$callback = function ($matches) use ($_buf) { return $_buf[$matches[1]]; }; // this works!
return preg_replace_callback('!\001(\d+)!', $callback, $text);
##return preg_replace_callback('!\001(\d+)!', array($this, 'restore'), $text); // NOT working - should be somehow else
} else {
return preg_replace('~\001(\d+)~e', '$_buf[$1]', $text);
}
}
function event_hook($event, &$bag, &$eventData, $addData = null) {