From b664435ef622eb463c008f7a9f339061c26951d4 Mon Sep 17 00:00:00 2001 From: onli Date: Thu, 13 Sep 2018 14:22:01 +0200 Subject: [PATCH] PHP 7.2 compat: session_cache, each (#564, #556) --- .../serendipity_event_entryproperties.php | 6 ++---- rss.php | 1 - serendipity.css.php | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php b/plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php index fcb664e9..997ed800 100644 --- a/plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php +++ b/plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php @@ -19,7 +19,7 @@ class serendipity_event_entryproperties extends serendipity_event $propbag->add('description', PLUGIN_EVENT_ENTRYPROPERTIES_DESC); $propbag->add('stackable', false); $propbag->add('author', 'Garvin Hicking'); - $propbag->add('version', '1.41'); + $propbag->add('version', '1.41.1'); $propbag->add('requirements', array( 'serendipity' => '1.6', 'smarty' => '2.6.27', @@ -488,9 +488,7 @@ class serendipity_event_entryproperties extends serendipity_event $plugins = serendipity_plugin_api::get_event_plugins(); if (is_array($plugins)) { - // foreach() operates on copies of values, but we want to operate on references, so we use while() - @reset($plugins); - while(list($plugin, $plugin_data) = each($plugins)) { + foreach($plugins as $plugin => $plugin_data) { if (!is_array($plugin_data['p']->markup_elements)) { continue; } diff --git a/rss.php b/rss.php index 401788d9..3b843eaa 100644 --- a/rss.php +++ b/rss.php @@ -3,7 +3,6 @@ # All rights reserved. See LICENSE file for licensing details header('Content-Type: text/xml; charset=utf-8'); -session_cache_limiter('public'); @define('IN_RSS', true); include('serendipity_config.inc.php'); diff --git a/serendipity.css.php b/serendipity.css.php index d1db8264..dc547310 100644 --- a/serendipity.css.php +++ b/serendipity.css.php @@ -7,7 +7,6 @@ define('IN_installer', true); define('IN_upgrader', true); define('IN_CSS', true); -session_cache_limiter('public'); if (!defined('S9Y_FRAMEWORK')) { include('serendipity_config.inc.php'); }