From c8537f6c7de18e6b072cec88ae587ad22f52a222 Mon Sep 17 00:00:00 2001 From: Andreas Scherbaum Date: Sat, 9 Jan 2021 13:05:08 +0100 Subject: [PATCH] Fix PHP warning about undefined constants (#120) * Fix PHP warning about undefined constants INCLUDE_ANY is not quoted Fix: #720 * Bump version numbers * Use minor version changes, instead of major version changes Rebase with master --- .../serendipity_event_communityrating.php | 2 +- .../serendipity_plugin_communityrating.php | 2 +- alpha/serendipity_event_communityrating/smarty.inc.php | 6 +++--- .../serendipity_event_findmore.php | 8 ++++---- .../serendipity_event_picasa/serendipity_event_picasa.php | 8 ++++---- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/alpha/serendipity_event_communityrating/serendipity_event_communityrating.php b/alpha/serendipity_event_communityrating/serendipity_event_communityrating.php index 9cc0fa87..385ab94c 100644 --- a/alpha/serendipity_event_communityrating/serendipity_event_communityrating.php +++ b/alpha/serendipity_event_communityrating/serendipity_event_communityrating.php @@ -26,7 +26,7 @@ class serendipity_event_communityrating extends serendipity_event $propbag->add('description', PLUGIN_EVENT_COMMUNITYRATING_DESC); $propbag->add('stackable', false); $propbag->add('author', 'Garvin Hicking, Lewe Zipfel'); - $propbag->add('version', '1.12'); + $propbag->add('version', '1.12.1'); $propbag->add('requirements', array( 'serendipity' => '0.9', 'smarty' => '2.6.7', diff --git a/alpha/serendipity_event_communityrating/serendipity_plugin_communityrating.php b/alpha/serendipity_event_communityrating/serendipity_plugin_communityrating.php index 714df71f..2a962d8a 100644 --- a/alpha/serendipity_event_communityrating/serendipity_plugin_communityrating.php +++ b/alpha/serendipity_event_communityrating/serendipity_plugin_communityrating.php @@ -25,7 +25,7 @@ class serendipity_plugin_communityrating extends serendipity_plugin $propbag->add('description', PLUGIN_EVENT_COMMUNITYRATING_AVGRATING_DESC); $propbag->add('stackable', true); $propbag->add('author', 'Lewe Zipfel, Garvin Hicking'); - $propbag->add('version', '1.2.1'); + $propbag->add('version', '1.2.2'); $propbag->add('requirements', array( 'serendipity' => '0.9', 'smarty' => '2.6.7', diff --git a/alpha/serendipity_event_communityrating/smarty.inc.php b/alpha/serendipity_event_communityrating/smarty.inc.php index 1b00cc31..61cbc1a3 100644 --- a/alpha/serendipity_event_communityrating/smarty.inc.php +++ b/alpha/serendipity_event_communityrating/smarty.inc.php @@ -118,8 +118,8 @@ function communityrating_serendipity_show($params, &$smarty) { if (!$tfile || $tfile == $filename) { $tfile = dirname(__FILE__) . '/' . $filename; } - $inclusion = $serendipity['smarty']->security_settings[INCLUDE_ANY]; - $serendipity['smarty']->security_settings[INCLUDE_ANY] = true; + $inclusion = $serendipity['smarty']->security_settings['INCLUDE_ANY']; + $serendipity['smarty']->security_settings['INCLUDE_ANY'] = true; $serendipity['smarty']->assign( array( 'communityrating_images' => $out, @@ -130,7 +130,7 @@ function communityrating_serendipity_show($params, &$smarty) { ) ); $content = $serendipity['smarty']->fetch('file:'. $tfile); - $serendipity['smarty']->security_settings[INCLUDE_ANY] = $inclusion; + $serendipity['smarty']->security_settings['INCLUDE_ANY'] = $inclusion; if (!empty($params['escaped'])) { echo serendipity_utf8_encode((function_exists('serendipity_specialchars') ? serendipity_specialchars($content) : htmlspecialchars($content, ENT_COMPAT, LANG_CHARSET))); diff --git a/alpha/serendipity_event_findmore/serendipity_event_findmore.php b/alpha/serendipity_event_findmore/serendipity_event_findmore.php index 14b1f242..6c0bbc67 100644 --- a/alpha/serendipity_event_findmore/serendipity_event_findmore.php +++ b/alpha/serendipity_event_findmore/serendipity_event_findmore.php @@ -22,7 +22,7 @@ class serendipity_event_findmore extends serendipity_event $propbag->add('description', PLUGIN_FINDMORE_DESCRIPTION); $propbag->add('stackable', false); $propbag->add('author', 'Garvin Hicking, Kodewulf'); - $propbag->add('version', '1.22'); + $propbag->add('version', '1.22.1'); $propbag->add('requirements', array( 'serendipity' => '0.8', 'smarty' => '2.6.7', @@ -190,12 +190,12 @@ class serendipity_event_findmore extends serendipity_event if (!$tfile || $tfile == $filename) { $tfile = dirname(__FILE__) . '/' . $filename; } - $inclusion = $serendipity['smarty']->security_settings[INCLUDE_ANY]; - $serendipity['smarty']->security_settings[INCLUDE_ANY] = true; + $inclusion = $serendipity['smarty']->security_settings['INCLUDE_ANY']; + $serendipity['smarty']->security_settings['INCLUDE_ANY'] = true; $serendipity['smarty']->assign('entrydata', $data); $content = $serendipity['smarty']->fetch('file:'. $tfile); - $serendipity['smarty']->security_settings[INCLUDE_ANY] = $inclusion; + $serendipity['smarty']->security_settings['INCLUDE_ANY'] = $inclusion; return $content; } diff --git a/alpha/serendipity_event_picasa/serendipity_event_picasa.php b/alpha/serendipity_event_picasa/serendipity_event_picasa.php index bb7664ee..95b66175 100644 --- a/alpha/serendipity_event_picasa/serendipity_event_picasa.php +++ b/alpha/serendipity_event_picasa/serendipity_event_picasa.php @@ -256,7 +256,7 @@ class serendipity_event_picasa extends serendipity_event { )); $propbag->add('stackable', false); $propbag->add('author', 'Thomas Nesges, Greg Greenway'); - $propbag->add('version', '1.14.1'); + $propbag->add('version', '1.14.2'); $propbag->add('requirements', array( 'serendipity' => '0.8', 'smarty' => '2.6.7', @@ -490,10 +490,10 @@ class serendipity_event_picasa extends serendipity_event { $serendipity['smarty']->assign(get_class($this).'_use_jswindow', $jswindow); $serendipity['smarty']->security_settings['MODIFIER_FUNCS'][] = "rand"; // necessary tweak before 0.8 final - $inclusion = $serendipity['smarty']->security_settings[INCLUDE_ANY]; - $serendipity['smarty']->security_settings[INCLUDE_ANY] = true; + $inclusion = $serendipity['smarty']->security_settings['INCLUDE_ANY']; + $serendipity['smarty']->security_settings['INCLUDE_ANY'] = true; $album_code = $serendipity['smarty']->fetch($smarty_template); - $serendipity['smarty']->security_settings[INCLUDE_ANY] = $inclusion; + $serendipity['smarty']->security_settings['INCLUDE_ANY'] = $inclusion; } return $album_code; }