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
This commit is contained in:
Andreas Scherbaum 2021-01-09 13:05:08 +01:00 committed by GitHub
parent 222ccc11b4
commit c8537f6c7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 13 deletions

View file

@ -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',

View file

@ -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',

View file

@ -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)));

View file

@ -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;
}

View file

@ -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;
}