From 54ce817caaab9650c9ab72377fa222921f635449 Mon Sep 17 00:00:00 2001 From: Ian Date: Thu, 12 Mar 2015 18:07:04 +0100 Subject: [PATCH] S9y 2.0 serendipity_editor.js.php and serendipity_define.js.php reference file fixes --- .../serendipity_event_advtypes.php | 6 +++++- serendipity_event_cal/ChangeLog | 4 ++++ serendipity_event_cal/plugin_eventcal_add.tpl | 4 ++-- serendipity_event_cal/serendipity_event_cal.php | 5 +++-- serendipity_event_cpgselector/ChangeLog | 5 +++++ serendipity_event_cpgselector/cpgselector.inc.php | 2 ++ .../serendipity_event_cpgselector.php | 2 +- serendipity_event_forum/ChangeLog | 6 ++++++ serendipity_event_forum/serendipity_event_forum.php | 4 +++- serendipity_event_forum/templates/editform.tpl | 2 +- serendipity_event_forum/templates/newthread.tpl | 2 +- serendipity_event_forum/templates/replyform.tpl | 2 +- serendipity_event_staticpage/ChangeLog | 2 ++ .../serendipity_event_staticpage.php | 10 ++++++---- 14 files changed, 42 insertions(+), 14 deletions(-) diff --git a/serendipity_event_advtypes/serendipity_event_advtypes.php b/serendipity_event_advtypes/serendipity_event_advtypes.php index f35ca89c..63e90581 100644 --- a/serendipity_event_advtypes/serendipity_event_advtypes.php +++ b/serendipity_event_advtypes/serendipity_event_advtypes.php @@ -31,7 +31,7 @@ class serendipity_event_advtypes extends serendipity_event { 'php' => '4.1.0' )); - $propbag->add('version', '0.6'); + $propbag->add('version', '0.7'); $propbag->add('author', 'Judebert (http://judebert.com/)'); $propbag->add('stackable', false); $propbag->add('event_hooks', array( @@ -100,8 +100,12 @@ class serendipity_event_advtypes extends serendipity_event { echo ''; //echo '
' . PREFERENCE_USE_JS_WARNING . '
'; $media_js = serendipity_getTemplateFile('media_input.js'); + if ($serendipity['version'][0] < 2) { print << +EOS; + } + print << function change_preview(id) { diff --git a/serendipity_event_cal/ChangeLog b/serendipity_event_cal/ChangeLog index 8b6ca29a..cba21269 100644 --- a/serendipity_event_cal/ChangeLog +++ b/serendipity_event_cal/ChangeLog @@ -1,6 +1,10 @@ *************************************************************************************************** * Legend: ! Bugfix, + New Features, * Changed, - Info Only * + +v.1.69.2: + * S9y 2.0 serendipity_editor.js reference file fix + * Propagate $smarty.env.staticpage_pagetitle (and the others) so that it can be used in entries.tpl * * v. 1.66 2011-02-23 Spartacus diff --git a/serendipity_event_cal/plugin_eventcal_add.tpl b/serendipity_event_cal/plugin_eventcal_add.tpl index 36c74e2a..e4a2b175 100644 --- a/serendipity_event_cal/plugin_eventcal_add.tpl +++ b/serendipity_event_cal/plugin_eventcal_add.tpl @@ -140,8 +140,8 @@ - {if $is_logged_in} - + {if $is_logged_in && $plugin_eventcal_add_not20} + {/if} diff --git a/serendipity_event_cal/serendipity_event_cal.php b/serendipity_event_cal/serendipity_event_cal.php index b7ddc6c9..c6cd65d2 100644 --- a/serendipity_event_cal/serendipity_event_cal.php +++ b/serendipity_event_cal/serendipity_event_cal.php @@ -76,7 +76,7 @@ class serendipity_event_cal extends serendipity_event { ) ); $propbag->add('author', 'Ian (Timbalu)'); - $propbag->add('version', '1.69.1'); + $propbag->add('version', '1.69.2'); $propbag->add('groups', array('FRONTEND_FEATURES', 'BACKEND_FEATURES')); $propbag->add('requirements', array( 'serendipity' => '1.4', @@ -1703,7 +1703,8 @@ class serendipity_event_cal extends serendipity_event { 'plugin_eventcal_add_tipo4' => ($tipo==4) ? 'checked="checked"' : '', 'plugin_eventcal_add_tipo5' => ($tipo==5) ? 'checked="checked"' : '', 'plugin_eventcal_add_tipo6' => ($tipo==6) ? 'checked="checked"' : '', - 'plugin_eventcal_add_url' => $url + 'plugin_eventcal_add_url' => $url, + 'plugin_eventcal_add_not20' => (($serendipity['version'][0] < 2) ? true : false) ) ); diff --git a/serendipity_event_cpgselector/ChangeLog b/serendipity_event_cpgselector/ChangeLog index 5ec2ee74..e7ab65ba 100644 --- a/serendipity_event_cpgselector/ChangeLog +++ b/serendipity_event_cpgselector/ChangeLog @@ -1,3 +1,8 @@ +2.08.2 +------ + * S9y 2.0 serendipity_define.js reference file fix + + 2.08: ----- Removed obsolete language attribute. (yellowled) diff --git a/serendipity_event_cpgselector/cpgselector.inc.php b/serendipity_event_cpgselector/cpgselector.inc.php index 8efbc1a5..d35a1d33 100644 --- a/serendipity_event_cpgselector/cpgselector.inc.php +++ b/serendipity_event_cpgselector/cpgselector.inc.php @@ -534,8 +534,10 @@ switch ($CPG['step']) { $image = cpg_getImage($CPG['image']); + if ($serendipity['version'][0] < 2) { ?> +