Changes in [3796:2a5df3ef4475:3804:7e5f79b790af]

Files:

• CHANGELOG (modified) (1 diff)
• admin/preferences.php (modified) (1 diff)
• build-tools/Minifier.php (added)
• build-tools/jsmin-1.1.1.php (deleted)
• build-tools/min-js.php (modified) (1 diff)
• plugins/themeEditor/index.php (modified) (1 diff)

CHANGELOG

@@ +1 @@
+Dotclear 2.14.1 - 2018-mm-dd
+===========================================================
+* 🐘 PHP 5.6+ is required - PHP 5.5 is buggy with the 2.14 release
+* Fix: smallest admin font size was set when saving user prefs
+* Fix: minifying JS scripts may cause problems with regular expressions
+* Fix: empty JS var was set for syntax coloration if disabled
+
 Dotclear 2.14 - 2018-08-13
 ===========================================================

admin/preferences.php

@@ -110 +110 @@
     __('Largest')  => '87,5%'
 );
+# Ensure Font size is set to default is empty
+if ($user_ui_htmlfontsize == '') {
+    $user_ui_htmlfontsize = '62.5%';
+}
 
 # Language codes

build-tools/min-js.php

@@ -17 +17 @@
     }
 
-    require dirname(__FILE__) . '/jsmin-1.1.1.php';
+    require dirname(__FILE__) . '/Minifier.php';
 
     $content = file_get_contents($js);
-    $res     = JSMin::minify($content);
+    $res     = \JShrink\Minifier::minify($content, array('flaggedComments' => false));
 
     if (($fp = fopen($js, 'wb')) === false) {

plugins/themeEditor/index.php

@@ -70 +70 @@
     'dotclear.msg.document_saved'     => __("Document saved"),
     'dotclear.msg.error_occurred'     => __("An error occurred:"),
-    'dotclear.msg.confirm_reset_file' => __("Are you sure you want to reset this file?"),
-    'dotclear.colorsyntax'            => $user_ui_colorsyntax
+    'dotclear.msg.confirm_reset_file' => __("Are you sure you want to reset this file?")
 )) .
 dcPage::jsConfirmClose('file-form') .
 dcPage::jsLoad(dcPage::getPF('themeEditor/js/script.js'));
 if ($user_ui_colorsyntax) {
+    echo dcPage::jsVar('dotclear.colorsyntax', $user_ui_colorsyntax);
     echo dcPage::jsLoadCodeMirror($user_ui_colorsyntax_theme);
 }