From 32ccbf1b470a901707a3ffd82a00356ab03b37d2 Mon Sep 17 00:00:00 2001
From: Ian <aristophian@googlemail.com>
Date: Wed, 12 Jun 2013 17:51:53 +0200
Subject: [PATCH] fixed bug in checkUpdate()

---
 serendipity_event_ckeditor/ChangeLog          |  4 ++++
 .../serendipity_event_ckeditor.php            | 23 ++++++++++---------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/serendipity_event_ckeditor/ChangeLog b/serendipity_event_ckeditor/ChangeLog
index 44970855..98e5d815 100644
--- a/serendipity_event_ckeditor/ChangeLog
+++ b/serendipity_event_ckeditor/ChangeLog
@@ -1,3 +1,7 @@
+1.2.1:
+-----
+    * Fixed bug in upgrade check
+
 1.2.0:
 -----
     * Update to CKEDITOR 4.1.2, 2013, June 10
diff --git a/serendipity_event_ckeditor/serendipity_event_ckeditor.php b/serendipity_event_ckeditor/serendipity_event_ckeditor.php
index d4c9e1c3..005b5f35 100644
--- a/serendipity_event_ckeditor/serendipity_event_ckeditor.php
+++ b/serendipity_event_ckeditor/serendipity_event_ckeditor.php
@@ -67,7 +67,7 @@ class serendipity_event_ckeditor extends serendipity_event
         // do we already have it?
         if (is_dir($this->cke_dir) && is_file($this->cke_dir . '/ckeditor.js')) {
             // this is running while getting a new Plugin version
-            if ($this->CheckUpdate()) {
+            if ($this->checkUpdate()) {
                 $this->set_config('installer', '4-'.date('Ymd-H:i:s')); // this is a faked debug notice, since falldown is extract true with case 0, 1 or 2
             } else {
                 $this->set_config('installer', '3-'.date('Ymd-H:i:s')); // this will happen, if no further extract is necessary in case of an update
@@ -101,7 +101,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',       '1.2.0');
+        $propbag->add('version',       '1.2.1');
         $propbag->add('copyright',     'GPL & LGPL License');
         $propbag->add('requirements',  array(
             'serendipity' => '1.7',
@@ -194,25 +194,26 @@ class serendipity_event_ckeditor extends serendipity_event
     }
 
     /**
-     * Check update versions and create config values
+     * Check update versions to perform unzip and create config values
      * @access    private
      * @return    boolean
      */
-    private function CheckUpdate() {
+    private function checkUpdate() {
 
         $doupdate = false;
 
         foreach(array_values($this->checkUpdateVersion) AS $package) {
+            $match = explode(':', $package);
             // always set and extract if not match
-            if( preg_match('/^' . $package . ':(.+$)/', $line, $match) ) {
-                if ($this->get_config('last_'.$match[0].'_version') == $match[1]){
-                    $doupdate = false;
-                } else {
-                    $this->set_config('last_'.$match[0].'_version', $match[1]);
-                    $doupdate = true;
-                }
+            if ($this->get_config('last_'.$match[0].'_version') == $match[1]) {
+                $doupdate = false;
+            } else {
+                $this->set_config('last_'.$match[0].'_version', $match[1]);
+                $doupdate = true;
+                break; // this is possibly needed to force install upgrade routines
             }
         }
+
         return $doupdate ? true : false;
     }