diff --git a/serendipity_event_ckeditor/ChangeLog b/serendipity_event_ckeditor/ChangeLog index 85132787..dfb25b26 100644 --- a/serendipity_event_ckeditor/ChangeLog +++ b/serendipity_event_ckeditor/ChangeLog @@ -1,3 +1,8 @@ +4.5.9.0: +----- + * Changed upgrade hint for lang files lang_ and lang_ + * Upgrade to CKEDITOR 4.5. Series, update 9 (http://ckeditor.com/whatsnew). + 4.5.8.1: ----- * Remove accidently added Thumbs.db file diff --git a/serendipity_event_ckeditor/UTF-8/lang_de.inc.php b/serendipity_event_ckeditor/UTF-8/lang_de.inc.php index 5644a921..5e0124c9 100644 --- a/serendipity_event_ckeditor/UTF-8/lang_de.inc.php +++ b/serendipity_event_ckeditor/UTF-8/lang_de.inc.php @@ -1,8 +1,8 @@ * DE-Revision: Revision of UTF-8/lang_de.inc.php */ @@ -27,7 +27,8 @@

Upgrading

Dieses Plugin wird zeitnah selber Updates via Spartacus bereitstellen.

-

Es ist nicht zu raten, ein eigenes customized CKEDITOR release zu erstellen und herunterzuladen, da dies zu unerwünschten Nebenwirkungen in der Einbindung führt.

+

Bitte nutzen Sie keinen automatischen Bulk Updater, sofern in ihrer S9y Version schon vorhanden, sondern führen Sie das Upgrade des CKEditors einzeln durch, um für die internen ZIP-Installer Operationen in diese Konfiguration weiter geleitet zu werden.

+

Es ist generell abzuraten, ein eigenes "customized" CKEDITOR release zu erstellen und herunterzuladen, da dies zu unerwünschten Nebenwirkungen in der Einbindung führt.

'); @define('PLUGIN_EVENT_CKEDITOR_CONFIG', ''); @define('PLUGIN_EVENT_CKEDITOR_INSTALL_PLUGPATH', 'HTTP Pfad des S9y Plugins Verzeichnisses'); diff --git a/serendipity_event_ckeditor/ckeditor_4.5.8.1-plus.zip b/serendipity_event_ckeditor/ckeditor_4.5.9.0-plus.zip similarity index 76% rename from serendipity_event_ckeditor/ckeditor_4.5.8.1-plus.zip rename to serendipity_event_ckeditor/ckeditor_4.5.9.0-plus.zip index 1b54fd15..aa517138 100644 Binary files a/serendipity_event_ckeditor/ckeditor_4.5.8.1-plus.zip and b/serendipity_event_ckeditor/ckeditor_4.5.9.0-plus.zip differ diff --git a/serendipity_event_ckeditor/lang_de.inc.php b/serendipity_event_ckeditor/lang_de.inc.php index d2770559..96b35d70 100644 --- a/serendipity_event_ckeditor/lang_de.inc.php +++ b/serendipity_event_ckeditor/lang_de.inc.php @@ -1,8 +1,8 @@ * DE-Revision: Revision of lang_de.inc.php */ @@ -27,7 +27,8 @@

Upgrading

Dieses Plugin wird zeitnah selber Updates via Spartacus bereitstellen.

-

Es ist nicht zu raten, ein eigenes customized CKEDITOR release zu erstellen und herunterzuladen, da dies zu unerwünschten Nebenwirkungen in der Einbindung führt.

+

Bitte nutzen Sie keinen automatischen Bulk Updater, sofern in ihrer S9y Version schon vorhanden, sondern führen Sie das Upgrade des CKEditors einzeln durch, um für die internen ZIP-Installer Operationen in diese Konfiguration weiter geleitet zu werden.

+

Es ist generell abzuraten, ein eigenes "customized" CKEDITOR release zu erstellen und herunterzuladen, da dies zu unerwünschten Nebenwirkungen in der Einbindung führt.

'); @define('PLUGIN_EVENT_CKEDITOR_CONFIG', ''); @define('PLUGIN_EVENT_CKEDITOR_INSTALL_PLUGPATH', 'HTTP Pfad des S9y Plugins Verzeichnisses'); diff --git a/serendipity_event_ckeditor/lang_en.inc.php b/serendipity_event_ckeditor/lang_en.inc.php index 170c9a9d..23210448 100644 --- a/serendipity_event_ckeditor/lang_en.inc.php +++ b/serendipity_event_ckeditor/lang_en.inc.php @@ -1,8 +1,8 @@ * EN-Revision: Revision of lang_en.inc.php */ @@ -27,7 +27,8 @@

Upgrading

This Plugin will provide Updates via Spartacus close to new CKEDITOR releases.

-

It is not advised to use or install any customized CKEDITOR releases, since this will lead to undesirable side effects with this Plugins configuration.

+

Please do not use any automatic plugin bulk update, if already available with your S9y version. Upgrade the CKEditor plugin singulary in list, to allow the internal routines to immediately fall back into this configuration, to run and deflate the ZIP-installer operations.

+

It is generally not advised to use or install any "customized" CKEDITOR releases, since this will lead to undesirable side effects with this Plugins configuration.

'); @define('PLUGIN_EVENT_CKEDITOR_CONFIG', ''); @define('PLUGIN_EVENT_CKEDITOR_INSTALL_PLUGPATH', 'HTTP path to s9y plugins directory'); diff --git a/serendipity_event_ckeditor/serendipity_event_ckeditor.php b/serendipity_event_ckeditor/serendipity_event_ckeditor.php index d41c4c71..47ea2e31 100644 --- a/serendipity_event_ckeditor/serendipity_event_ckeditor.php +++ b/serendipity_event_ckeditor/serendipity_event_ckeditor.php @@ -49,23 +49,23 @@ class serendipity_event_ckeditor extends serendipity_event * @access protected * @var string */ - protected $cke_zipfile = 'ckeditor_4.5.8.1-plus.zip'; + protected $cke_zipfile = 'ckeditor_4.5.9.0-plus.zip'; /** * Access property checkUpdateVersion * Verify release package versions - do update on upgrades! * @var array */ - protected $checkUpdateVersion = array('ckeditor:4.5.8.1'); + protected $checkUpdateVersion = array('ckeditor:4.5.9.0'); /** * Access property revisionPackage * Note revisions of ckeditor and plugin additions to lang files * @var array */ - protected $revisionPackage = array('CKEditor 4.5.8 (revision c1fc9a9, full package, 2016-03-31)', + protected $revisionPackage = array('CKEditor 4.5.9 (revision a35abfe, full package, 2016-05-13)', 'CKEditor-Plugin: mediaembed, v. 0.6+ (https://github.com/frozeman/MediaEmbed, 2014-03-13)', - 'CKEditor-Plugin: manually added codesnippet, fakeobjects, lineutils and widget plugins, 2016-03-31)', + 'CKEditor-Plugin: manually added codesnippet, fakeobjects, lineutils and widget plugins, 2016-05-13)', 'CKEditor-Plugin: procurator, v. 1.6 (Serendipity placeholder Plugin, 2016-01-01)', 'CKEditor-Plugin: cheatsheet, v. 1.2 (Serendipity CKE-Cheatsheet Plugin, 2015-01-28)', 'CKEditor-S9yCustomConfig, cke_config.js, v. 2.5, 2016-01-01', @@ -118,8 +118,9 @@ class serendipity_event_ckeditor extends serendipity_event @unlink($this->cke_path . '/UTF-8/documentation_cz.html'); @unlink($this->cke_path . '/UTF-8/lang_en.inc.php'); @unlink($this->cke_path . '/UTF-8/documentation_cs.html'); - // purge accidently added Thumbs.db file with 4.5.8.0 throwing errors on unzip + // purge accidently added Thumbs.db file with 4.5.8.0/1 throwing errors on unzip @unlink($this->cke_path . '/ckeditor/plugins/codesnippet/icons/hidpi/Thumbs.db'); + @unlink($this->cke_path . '/ckeditor/plugins/procurator/images/Thumbs.db'); } // remove widget/dev samples directory if (is_file(dirname(__FILE__) . '/ckeditor/plugins/widget/dev/console.js')) { @@ -180,7 +181,7 @@ class serendipity_event_ckeditor extends serendipity_event $propbag->add('description', PLUGIN_EVENT_CKEDITOR_DESC); $propbag->add('stackable', false); $propbag->add('author', 'Rustam Abdullaev, Ian'); - $propbag->add('version', '4.5.8.1'); // is CKEDITOR Series 4.5.8 - and appended plugin revision .1 + $propbag->add('version', '4.5.9.0'); // is CKEDITOR Series 4.5.9 - and appended plugin revision .0 $propbag->add('copyright', 'GPL or LGPL License'); $propbag->add('requirements', array( 'serendipity' => '1.7', @@ -357,7 +358,7 @@ class serendipity_event_ckeditor extends serendipity_event WHERE plugin_class = '" . serendipity_db_escape_string('serendipity_event_ckeditor') . "' LIMIT 1", true, 'assoc'); - $versions = array('4.5.8.0', '4.5.8.1'); // keep prior and current version false check only + $versions = array($oldVersion, $newVersion); // keep prior and current versions false check if (in_array($row['version'], $versions)) return false; serendipity_db_query("UPDATE {$serendipity['dbPrefix']}pluginlist @@ -375,7 +376,7 @@ class serendipity_event_ckeditor extends serendipity_event */ private function updateTableZip() { - $this->temporaryDowngrade('4.5.8.1', '4.5.8.0'); // temporary + $this->temporaryDowngrade('4.5.9.0', '4.5.8.1'); // temporary foreach(array_values($this->checkUpdateVersion) AS $package) { $match = explode(':', $package); $this->set_config('last_'.$match[0].'_version', $match[1]); @@ -389,7 +390,7 @@ class serendipity_event_ckeditor extends serendipity_event */ private function checkUpdate() { - $this->temporaryDowngrade('4.5.8.1', '4.5.8.0'); // temporary + $this->temporaryDowngrade('4.5.9.0', '4.5.8.1'); // temporary $doupdate = false; foreach(array_values($this->checkUpdateVersion) AS $package) { $match = explode(':', $package);