Release 2.1.6

Signed-off-by: Thomas Hochstein <thh@inter.net>
Release preparations.
2019-08-09 22:06:05 +02:00 · 2019-08-09 22:01:50 +02:00 · 2019-06-30 19:32:01 +02:00 · 2019-06-02 10:51:05 +02:00 · 2019-05-01 19:46:16 +02:00
5 changed files with 29 additions and 4 deletions
@@ -1,3 +1,9 @@
+Version 2.1.6 (August 9th, 2019)
+------------------------------------------------------------------------
+   * Prevent error in upgrader when $sqlfiles is NULL.
+
+   * Fix preview iframe in bulletproof, thx pixel32
+
 Version 2.1.5 (May 1st, 2019)
 ------------------------------------------------------------------------
    * Security: Fix XSS in Editor Preview by interpreted EXIF tags
@@ -1,2 +1,2 @@
-stable:2.1.5
+stable:2.1.6
 beta:2.3-beta1
@@ -47,7 +47,7 @@ if (defined('USE_MEMSNAP')) {
 }

 // The version string
-$serendipity['version'] = '2.1.5';
+$serendipity['version'] = '2.1.6';


 // Setting this to 'false' will enable debugging output. All alpha/beta/cvs snapshot versions will emit debug information by default. To increase the debug level (to enable Smarty debugging), set this flag to 'debug'.
@@ -125,7 +125,7 @@
        {/if}
        </div>
        {if ($errorCount < 1)}
-            {if (sizeof($sqlfiles) > 0)}
+            {if $sqlfiles && (sizeof($sqlfiles) > 0)}
                <h3>{$database_update_types}:</h3>

                <p>{$CONST.SERENDIPITY_UPGRADER_FOUND_SQL_FILES}:</p>
@@ -149,7 +149,7 @@
            {if ($taskCount == 0)}
                <p>{$CONST.SERENDIPITY_UPGRADER_NO_VERSION_SPECIFIC}</p>
            {/if}
-            {if (($taskCount > 0) || (sizeof($sqlfiles) > 0))}
+            {if (($taskCount > 0) || ($sqlfiles && (sizeof($sqlfiles) > 0)))}
                <h3>{$CONST.SERENDIPITY_UPGRADER_PROCEED_QUESTION}</h3>

                <a class="button_link state_submit" href="{$upgradeLoc}">{$CONST.SERENDIPITY_UPGRADER_PROCEED_DOIT}</a>{if $showAbort} <a class="button_link state_cancel" href="{$abortLoc}">{$CONST.SERENDIPITY_UPGRADER_PROCEED_ABORT}</a>{/if}
@@ -40,6 +40,25 @@
    <body style="padding: 0px; margin: 0px;">
    <div id="wrapper" style="width: 100%; border: 0;">
    <div id="content" style="padding: 5px; margin: 0px;">
+    {if $mode == 'preview'}
+         <div class="clearfix">
+     {elseif $mode == 'save'}
+         <div class="clearfix">
+         <div style="float: left; height: 75px"></div>
+         {$updertHooks}
+         {if $res}
+             <div class="serendipity_msg_important">{$CONST.ERROR}: <b>{$res}</b></div>
+         {else}
+             {if $lastSavedEntry}
+                 <script type="text/javascript">$(document).ready(function() {
+                                                     parent.document.forms['serendipityEntry']['serendipity[id]'].value = "{$lastSavedEntry}";
+                 });
+                 </script>
+             {/if}
+             <span class="msg_success"><span class="icon-ok-circled"></span> {$CONST.ENTRY_SAVED}</span>
+             <a href="{$entrylink}" target="_blank">{$CONST.VIEW}</a>
+         {/if}
+     {/if}
    {$preview}
    </div>
    </div>
Author	SHA1	Message	Date
Thomas Hochstein	bf2f60f13a	Release 2.1.6 Signed-off-by: Thomas Hochstein <thh@inter.net>	2019-08-09 22:06:05 +02:00
Thomas Hochstein	47ec0c9768	Release preparations. Signed-off-by: Thomas Hochstein <thh@inter.net>	2019-08-09 22:01:50 +02:00
Matthias Mees	dce27856ee	Fix preview iframe in bulletproof, thx pixel32	2019-06-30 19:32:01 +02:00
onli	03cdba82ab	Prevent error in upgrader when $sqlfiles is NULL. Backported from master branch. Signed-off-by: Thomas Hochstein <thh@inter.net>	2019-06-02 10:51:05 +02:00
Thomas Hochstein	6b972c9f41	After release. Signed-off-by: Thomas Hochstein <thh@inter.net>	2019-05-01 19:46:16 +02:00