From 63f7510ebd40575ef513c65e58ae7db447e36938 Mon Sep 17 00:00:00 2001
From: Garvin Hicking <blog@garv.in>
Date: Wed, 25 Jun 2014 13:22:39 +0200
Subject: [PATCH] References #134 Fixes thumbnail regeneration, only a problem
 with proper execution order

---
 docs/NEWS                        | 2 ++
 include/admin/images.inc.php     | 8 ++++----
 include/functions_images.inc.php | 3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/docs/NEWS b/docs/NEWS
index d8937869..6d952138 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -4,6 +4,8 @@
 Version 2.0-beta3 ()
 ------------------------------------------------------------------------
 
+    * Fixed thumbnail recreation, Issue #134
+    
     * Merged external JS libraries into a central "plugins.js" of the 2k11
       backend template, can be updated through 
       templates/2k11/admin/js/gruntipity.php helper script.
diff --git a/include/admin/images.inc.php b/include/admin/images.inc.php
index 4416dc3c..c8b23fe5 100644
--- a/include/admin/images.inc.php
+++ b/include/admin/images.inc.php
@@ -30,10 +30,6 @@ switch ($serendipity['GET']['adminAction']) {
         }
         @ignore_user_abort();
 
-        $i = serendipity_syncThumbs($deleteThumbs);
-        $data['print_SYNC_DONE'] = sprintf(SYNC_DONE, $i);
-        flush();
-
         $deleteThumbs = false;
         if (isset($serendipity['POST']['deleteThumbs'])) {
             switch ($serendipity['POST']['deleteThumbs'])
@@ -47,6 +43,10 @@ switch ($serendipity['GET']['adminAction']) {
             }
         }
 
+        $i = serendipity_syncThumbs($deleteThumbs);
+        $data['print_SYNC_DONE'] = sprintf(SYNC_DONE, $i);
+        flush();
+
         $i = serendipity_generateThumbs();
         $data['print_RESIZE_DONE'] = sprintf(RESIZE_DONE, $i);
         flush();
diff --git a/include/functions_images.inc.php b/include/functions_images.inc.php
index fa5a2302..0e9a412a 100644
--- a/include/functions_images.inc.php
+++ b/include/functions_images.inc.php
@@ -832,7 +832,7 @@ function serendipity_generateThumbs() {
                         echo "\n" . '<ul class="serendipityFileList">' . "\n";
                         $msg_printed = true;
                     }
-                    echo '<li>' . $sThumb . ': ' . $returnsize[0] . 'x' . $returnsize[1] . "</li>\n";
+                    echo '<li>' . $sThumb . ': ' . $returnsize['width'] . 'x' . $returnsize['height'] . "</li>\n";
                     if (!file_exists($newThumb)) {
                         printf('<li><span class="msg_error"><span class="icon-attention"></span> ' . THUMBNAIL_FAILED_COPY . '</span></li>' . "\n", $sThumb);
                     } else {
@@ -1097,6 +1097,7 @@ function serendipity_syncThumbs($deleteThumbs = false) {
     $files = serendipity_fetchImages();
 
     $fcount = count($files);
+
     for ($x = 0; $x < $fcount; $x++) {
         $update = array();
         $f      = serendipity_parseFileName($files[$x]);