diff --git a/serendipity_event_aggregator/serendipity_event_aggregator.php b/serendipity_event_aggregator/serendipity_event_aggregator.php index 486da93e..38a6715c 100644 --- a/serendipity_event_aggregator/serendipity_event_aggregator.php +++ b/serendipity_event_aggregator/serendipity_event_aggregator.php @@ -72,7 +72,7 @@ class serendipity_event_aggregator extends serendipity_event { 'php' => '4.1.0' )); - $propbag->add('version', '0.34'); + $propbag->add('version', '0.34.1'); $propbag->add('author', 'Evan Nemerson, Garvin Hicking, Kristian Koehntopp, Thomas Schulz, Claus Schmidt'); $propbag->add('stackable', false); $propbag->add('event_hooks', array( @@ -1715,10 +1715,10 @@ class serendipity_event_aggregator 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; $content = $serendipity['smarty']->fetch('file:'. $tfile); - $serendipity['smarty']->security_settings[INCLUDE_ANY] = $inclusion; + $serendipity['smarty']->security_settings['INCLUDE_ANY'] = $inclusion; return $content; } @@ -1820,4 +1820,4 @@ EOF; } } -/* vim: set sts=4 ts=4 expandtab : */ \ No newline at end of file +/* vim: set sts=4 ts=4 expandtab : */ diff --git a/serendipity_event_customarchive/serendipity_event_customarchive.php b/serendipity_event_customarchive/serendipity_event_customarchive.php index 644c7335..67c1ea8d 100644 --- a/serendipity_event_customarchive/serendipity_event_customarchive.php +++ b/serendipity_event_customarchive/serendipity_event_customarchive.php @@ -94,7 +94,7 @@ class serendipity_event_customarchive extends serendipity_event { $propbag->add('event_hooks', array('entries_header' => true, 'entry_display' => true, 'genpage' => true)); $propbag->add('configuration', array('permalink', 'pagetitle', 'articleformat')); $propbag->add('author', 'Garvin Hicking'); - $propbag->add('version', '1.12.1'); + $propbag->add('version', '1.12.2'); $propbag->add('requirements', array( 'serendipity' => '0.8', 'smarty' => '2.6.7', @@ -576,10 +576,10 @@ class serendipity_event_customarchive 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; $content = $serendipity['smarty']->fetch('file:'. $tfile); - $serendipity['smarty']->security_settings[INCLUDE_ANY] = $inclusion; + $serendipity['smarty']->security_settings['INCLUDE_ANY'] = $inclusion; $serendipity['smarty']->assign('ENTRIES', 'xxx'); @@ -648,4 +648,4 @@ class serendipity_event_customarchive extends serendipity_event { } } } -/* vim: set sts=4 ts=4 expandtab : */ \ No newline at end of file +/* vim: set sts=4 ts=4 expandtab : */ diff --git a/serendipity_event_forum/serendipity_event_forum.php b/serendipity_event_forum/serendipity_event_forum.php index e8794a5e..e9f2777c 100644 --- a/serendipity_event_forum/serendipity_event_forum.php +++ b/serendipity_event_forum/serendipity_event_forum.php @@ -53,7 +53,7 @@ class serendipity_event_forum extends serendipity_event { 'php' => '4.1.0' )); - $propbag->add('version', '0.38.3'); + $propbag->add('version', '0.38.4'); $propbag->add('author', 'Alexander \'dma147\' Mieland, http://blog.linux-stats.org, dma147@linux-stats.org'); $propbag->add('stackable', false); $propbag->add('event_hooks', array( @@ -1934,10 +1934,10 @@ class serendipity_event_forum 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; $content = $serendipity['smarty']->fetch('file:'. $tfile); - $serendipity['smarty']->security_settings[INCLUDE_ANY] = $inclusion; + $serendipity['smarty']->security_settings['INCLUDE_ANY'] = $inclusion; echo $content; } diff --git a/serendipity_event_microformats/serendipity_event_microformats.php b/serendipity_event_microformats/serendipity_event_microformats.php index ad0635d1..17f8cc26 100644 --- a/serendipity_event_microformats/serendipity_event_microformats.php +++ b/serendipity_event_microformats/serendipity_event_microformats.php @@ -59,7 +59,7 @@ class serendipity_event_microformats extends serendipity_event $propbag->add('description', PLUGIN_EVENT_MICROFORMATS_DESC); $propbag->add('stackable', false); $propbag->add('author', 'Matthias Gutjahr'); - $propbag->add('version', '0.46.1'); + $propbag->add('version', '0.46.2'); $propbag->add('requirements', array( 'serendipity' => '0.9', 'smarty' => '2.6.7', diff --git a/serendipity_event_microformats/smarty.inc.php b/serendipity_event_microformats/smarty.inc.php index 4eeb6844..3089162f 100644 --- a/serendipity_event_microformats/smarty.inc.php +++ b/serendipity_event_microformats/smarty.inc.php @@ -107,8 +107,8 @@ echo '';*/ 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; switch ($params['mf_type']) { case 'hReview': $serendipity['smarty']->assign( @@ -158,7 +158,7 @@ echo '';*/ break; } $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/serendipity_event_mymood/serendipity_event_mymood.php b/serendipity_event_mymood/serendipity_event_mymood.php index 5af787b7..0eaa09e6 100644 --- a/serendipity_event_mymood/serendipity_event_mymood.php +++ b/serendipity_event_mymood/serendipity_event_mymood.php @@ -56,7 +56,7 @@ class serendipity_event_mymood extends serendipity_event { 'php' => '4.1.0' )); - $propbag->add('version', '0.12.0'); + $propbag->add('version', '0.12.1'); $propbag->add('author', 'Brett Profitt, Matthias Mees'); $propbag->add('stackable', false); $propbag->add('event_hooks', array( @@ -552,14 +552,14 @@ class serendipity_event_mymood extends serendipity_event { if (!$tfile) { $tfile = dirname(__FILE__) . '/plugin_mymood.tpl'; } - $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('plugin_mymood_intro', $this->get_config('intro', '')); $serendipity['smarty']->assign('plugin_mymood_location', $this->get_config('location', 'body')); $serendipity['smarty']->assign('plugin_mymood_mood_list', $formatted_moods); $serendipity['smarty']->assign('plugin_mymood_outro', $this->get_config('outro', '')); $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/serendipity_event_oembed/OEmbedTemplater.php b/serendipity_event_oembed/OEmbedTemplater.php index 7f57d115..1ccf2df7 100644 --- a/serendipity_event_oembed/OEmbedTemplater.php +++ b/serendipity_event_oembed/OEmbedTemplater.php @@ -16,8 +16,8 @@ class OEmbedTemplater { $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; if (version_compare($serendipity['version'], '1.7-alpha1')>=0) { $serendipity['smarty']->disableSecurity(); @@ -31,8 +31,8 @@ class OEmbedTemplater { // be smarty 3 compat including the serendipity_smarty class wrappers ->fetch and ->display methods and remove changed parameter number 4 $content = @$serendipity['smarty']->fetch('file:'. $tfile);//, false - $serendipity['smarty']->security_settings[@INCLUDE_ANY] = $inclusion; + $serendipity['smarty']->security_settings['INCLUDE_ANY'] = $inclusion; return $content; } -} \ No newline at end of file +} diff --git a/serendipity_event_oembed/serendipity_event_oembed.php b/serendipity_event_oembed/serendipity_event_oembed.php index 62a7783b..ca5b1056 100644 --- a/serendipity_event_oembed/serendipity_event_oembed.php +++ b/serendipity_event_oembed/serendipity_event_oembed.php @@ -30,7 +30,7 @@ class serendipity_event_oembed extends serendipity_event $propbag->add('description', PLUGIN_EVENT_OEMBED_DESC); $propbag->add('stackable', false); $propbag->add('author', 'Grischa Brockhaus'); - $propbag->add('version', '1.15'); + $propbag->add('version', '1.15.1'); $propbag->add('requirements', array( 'serendipity' => '0.8', 'smarty' => '2.6.7', diff --git a/serendipity_event_relatedlinks/serendipity_event_relatedlinks.php b/serendipity_event_relatedlinks/serendipity_event_relatedlinks.php index b18140ea..24dd4f94 100644 --- a/serendipity_event_relatedlinks/serendipity_event_relatedlinks.php +++ b/serendipity_event_relatedlinks/serendipity_event_relatedlinks.php @@ -30,7 +30,7 @@ class serendipity_event_relatedlinks extends serendipity_event 'smarty' => '2.6.7', 'php' => '4.1.0' )); - $propbag->add('version', '1.8.1'); + $propbag->add('version', '1.8.2'); $propbag->add('event_hooks', array( 'frontend_display:html:per_entry' => true, 'backend_publish' => true, @@ -175,14 +175,14 @@ class serendipity_event_relatedlinks extends serendipity_event if (!$tfile) { $tfile = dirname(__FILE__) . '/plugin_relatedlinks.tpl'; } - $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; $content = $serendipity['smarty']->fetch('file:'. $tfile); if (count($html_links) < 1) { $content = true; } - $serendipity['smarty']->security_settings[INCLUDE_ANY] = $inclusion; + $serendipity['smarty']->security_settings['INCLUDE_ANY'] = $inclusion; if (!empty($content)) { $q = "DELETE FROM {$serendipity['dbPrefix']}entryproperties WHERE entryid = ". (int)$eventData['id'] . " AND (property = 'relatedentries' OR property = 'post_relatedentries')"; @@ -238,4 +238,4 @@ class serendipity_event_relatedlinks extends serendipity_event } /* vim: set sts=4 ts=4 expandtab : */ -?> \ No newline at end of file +?> diff --git a/serendipity_event_staticpage/ChangeLog b/serendipity_event_staticpage/ChangeLog index 293b9943..5a6e57fe 100644 --- a/serendipity_event_staticpage/ChangeLog +++ b/serendipity_event_staticpage/ChangeLog @@ -1,3 +1,5 @@ +4.15.1: Fix deprecated use of undefined constant INCLUDE_ANY + 4.15: Override content message when 404 view is taken over by this plugin 4.14: Iconfont a11y fix (yellowled) @@ -272,4 +274,4 @@ 2.12: (Falk Doering) * Support display of last change and page back/next navigation - * Support display of "Edit this page" link \ No newline at end of file + * Support display of "Edit this page" link diff --git a/serendipity_event_staticpage/serendipity_event_staticpage.php b/serendipity_event_staticpage/serendipity_event_staticpage.php index c6683947..594f7634 100644 --- a/serendipity_event_staticpage/serendipity_event_staticpage.php +++ b/serendipity_event_staticpage/serendipity_event_staticpage.php @@ -90,7 +90,7 @@ class serendipity_event_staticpage extends serendipity_event $propbag->add('page_configuration', $this->config); $propbag->add('type_configuration', $this->config_types); $propbag->add('author', 'Marco Rinck, Garvin Hicking, David Rolston, Falk Doering, Stephan Manske, Pascal Uhlmann, Ian, Don Chambers'); - $propbag->add('version', '4.15'); + $propbag->add('version', '4.15.1'); $propbag->add('requirements', array( 'serendipity' => '2.0', 'smarty' => '2.6.7', @@ -1287,10 +1287,10 @@ class serendipity_event_staticpage 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; $content = $serendipity['smarty']->fetch('file:'. $tfile); - $serendipity['smarty']->security_settings[INCLUDE_ANY] = $inclusion; + $serendipity['smarty']->security_settings['INCLUDE_ANY'] = $inclusion; return $content; } @@ -2557,8 +2557,8 @@ foreach($select AS $select_value => $select_desc) { $tfile = dirname(__FILE__) . '/backend_templates/' . $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( 'showmeta' => serendipity_db_bool($this->get_config('showmeta')), @@ -2570,7 +2570,7 @@ foreach($select AS $select_value => $select_desc) { ) ); $content = $serendipity['smarty']->fetch('file:'. $tfile); - $serendipity['smarty']->security_settings[INCLUDE_ANY] = $inclusion; + $serendipity['smarty']->security_settings['INCLUDE_ANY'] = $inclusion; echo $content; return true; @@ -3227,4 +3227,4 @@ foreach($select AS $select_value => $select_desc) { } -/* vim: set sts=4 ts=4 expandtab : */ \ No newline at end of file +/* vim: set sts=4 ts=4 expandtab : */ diff --git a/serendipity_event_suggest/serendipity_event_suggest.php b/serendipity_event_suggest/serendipity_event_suggest.php index 367e2263..90699f8e 100644 --- a/serendipity_event_suggest/serendipity_event_suggest.php +++ b/serendipity_event_suggest/serendipity_event_suggest.php @@ -31,7 +31,7 @@ class serendipity_event_suggest extends serendipity_event { )); $propbag->add('configuration', array('permalink', 'pagetitle', 'authorid', 'email')); $propbag->add('author', 'Garvin Hicking'); - $propbag->add('version', '0.11.2'); + $propbag->add('version', '0.11.3'); $propbag->add('groups', array('FRONTEND_FEATURES')); $propbag->add('requirements', array( 'serendipity' => '0.9', @@ -310,10 +310,10 @@ class serendipity_event_suggest extends serendipity_event { if (!$tfile) { $tfile = dirname(__FILE__) . '/plugin_suggest.tpl'; } - $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; $content = $serendipity['smarty']->fetch('file:'. $tfile); - $serendipity['smarty']->security_settings[INCLUDE_ANY] = $inclusion; + $serendipity['smarty']->security_settings['INCLUDE_ANY'] = $inclusion; echo $content; } @@ -443,4 +443,4 @@ class serendipity_event_suggest extends serendipity_event { } } -/* vim: set sts=4 ts=4 expandtab : */ \ No newline at end of file +/* vim: set sts=4 ts=4 expandtab : */ diff --git a/serendipity_event_userprofiles/serendipity_event_userprofiles.php b/serendipity_event_userprofiles/serendipity_event_userprofiles.php index 7e0acb9d..d4207d78 100755 --- a/serendipity_event_userprofiles/serendipity_event_userprofiles.php +++ b/serendipity_event_userprofiles/serendipity_event_userprofiles.php @@ -97,7 +97,7 @@ class serendipity_event_userprofiles extends serendipity_event { 'genpage' => true )); $propbag->add('author', 'Garvin Hicking, Falk Doering'); - $propbag->add('version', '0.31'); + $propbag->add('version', '0.31.1'); $propbag->add('requirements', array( 'serendipity' => '2.0', 'smarty' => '2.6.7', @@ -309,10 +309,10 @@ class serendipity_event_userprofiles extends serendipity_event { if (!$tfile) { $tfile = dirname(__FILE__) . '/plugin_groupmembers.tpl'; } - $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; $content = $serendipity['smarty']->fetch('file:'. $tfile); - $serendipity['smarty']->security_settings[INCLUDE_ANY] = $inclusion; + $serendipity['smarty']->security_settings['INCLUDE_ANY'] = $inclusion; echo $content; } @@ -544,8 +544,8 @@ class serendipity_event_userprofiles extends serendipity_event { if (!$tfile) { $tfile = dirname(__FILE__) . '/plugin_userprofile.tpl'; } - $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; $profile = $this->getConfigVars($serendipity['GET']['viewAuthor']); $local_properties =& $this->getLocalProperties(); foreach($local_properties as $property => $info) { @@ -565,7 +565,7 @@ class serendipity_event_userprofiles extends serendipity_event { $serendipity['smarty']->assign('userProfileTitle', PLUGIN_EVENT_USERPROFILES_SHOW); $content = $serendipity['smarty']->fetch('file:'. $tfile); - $serendipity['smarty']->security_settings[INCLUDE_ANY] = $inclusion; + $serendipity['smarty']->security_settings['INCLUDE_ANY'] = $inclusion; echo $content; } @@ -814,4 +814,4 @@ class serendipity_event_userprofiles extends serendipity_event { } } -/* vim: set sts=4 ts=4 expandtab : */ \ No newline at end of file +/* vim: set sts=4 ts=4 expandtab : */ diff --git a/serendipity_plugin_adduser/common.inc.php b/serendipity_plugin_adduser/common.inc.php index 1c408e4a..c6b04950 100644 --- a/serendipity_plugin_adduser/common.inc.php +++ b/serendipity_plugin_adduser/common.inc.php @@ -289,8 +289,8 @@ class serendipity_common_adduser { 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']->display($tfile); } } diff --git a/serendipity_plugin_adduser/serendipity_event_adduser.php b/serendipity_plugin_adduser/serendipity_event_adduser.php index 2ecaa740..ffb1618f 100644 --- a/serendipity_plugin_adduser/serendipity_event_adduser.php +++ b/serendipity_plugin_adduser/serendipity_event_adduser.php @@ -12,7 +12,7 @@ class serendipity_event_adduser extends serendipity_event $propbag->add('description', PLUGIN_ADDUSER_DESC); $propbag->add('stackable', false); $propbag->add('author', 'Garvin Hicking'); - $propbag->add('version', '2.38.2'); + $propbag->add('version', '2.38.3'); $propbag->add('requirements', array( 'serendipity' => '0.8', 'smarty' => '2.6.7', @@ -209,8 +209,8 @@ class serendipity_event_adduser 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']->display($tfile); break; diff --git a/serendipity_plugin_showentries/serendipity_plugin_showentries.php b/serendipity_plugin_showentries/serendipity_plugin_showentries.php index 85ee4d03..ce3b980a 100644 --- a/serendipity_plugin_showentries/serendipity_plugin_showentries.php +++ b/serendipity_plugin_showentries/serendipity_plugin_showentries.php @@ -28,7 +28,7 @@ class serendipity_plugin_showentries extends serendipity_plugin { 'php' => '4.1.0' )); $propbag->add('author', 'Garvin Hicking'); - $propbag->add('version', '1.8.1'); + $propbag->add('version', '1.8.2'); $propbag->add('stackable', true); $propbag->add('groups', array('FRONTEND_VIEWS')); } @@ -156,10 +156,10 @@ class serendipity_plugin_showentries extends serendipity_plugin { if (!$tfile) { $tfile = dirname(__FILE__) . '/plugin_showentries.tpl'; } - $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; $content = $serendipity['smarty']->fetch('file:'. $tfile); - $serendipity['smarty']->security_settings[INCLUDE_ANY] = $inclusion; + $serendipity['smarty']->security_settings['INCLUDE_ANY'] = $inclusion; echo $content;