Merge pull request #108 from robelix/php7.3
serendipity_event_aggregator fixes for php7.3
This commit is contained in:
commit
0984ce6ea8
|
@ -72,7 +72,7 @@ class serendipity_event_aggregator extends serendipity_event {
|
|||
'php' => '4.1.0'
|
||||
));
|
||||
|
||||
$propbag->add('version', '0.34.1');
|
||||
$propbag->add('version', '0.34.2');
|
||||
$propbag->add('author', 'Evan Nemerson, Garvin Hicking, Kristian Koehntopp, Thomas Schulz, Claus Schmidt');
|
||||
$propbag->add('stackable', false);
|
||||
$propbag->add('event_hooks', array(
|
||||
|
@ -129,13 +129,13 @@ class serendipity_event_aggregator extends serendipity_event {
|
|||
$markups = array();
|
||||
|
||||
if (is_array($plugins)) {
|
||||
// foreach() operates on copies of values, but we want to operate on references, so we use while()
|
||||
// foreach() operates on copies of values by default and it's not recommended to use it with references
|
||||
@reset($plugins);
|
||||
while(list($plugin, $plugin_data) = each($plugins)) {
|
||||
if (!is_array($plugin_data['p']->markup_elements)) {
|
||||
foreach( array_keys($plugins) as $plugin ) {
|
||||
if (!is_array($plugins[$plugin]['p']->markup_elements)) {
|
||||
continue;
|
||||
}
|
||||
$markups[$plugin_data['p']->instance] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($plugin_data['p']->title) : htmlspecialchars($plugin_data['p']->title, ENT_COMPAT, LANG_CHARSET));
|
||||
$markups[ $plugins[$plugin]['p']->instance ] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($plugins[$plugin]['p']->title) : htmlspecialchars($plugins[$plugin]['p']->title, ENT_COMPAT, LANG_CHARSET));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1432,7 +1432,7 @@ class serendipity_event_aggregator extends serendipity_event {
|
|||
}
|
||||
}
|
||||
|
||||
while(list($key, $item) = each($stack)) {
|
||||
foreach($stack as $key => $item) {
|
||||
|
||||
if ($opt['store_seperate']) {
|
||||
$ep_id = $cache_entries[$item['title']][$feed['feedid']][$item['date']];
|
||||
|
|
Loading…
Reference in a new issue