Changeset 3858:ebcc8a63a4e1 for inc/dbschema/upgrade.php

Timestamp:

09/04/18 11:14:41 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

3857:f3946d839070 (diff), 3855:08b090767191 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 2.14.2 branch

Files:

• inc/dbschema/upgrade.php (modified) (1 diff)
• inc/dbschema/upgrade.php (modified) (1 diff)

inc/dbschema/upgrade.php

@@ -702 +702 @@
         }
 
+        if (version_compare($version, '2.15', '<')) {
+            # switch from jQuery 1.11.3 to 1.12.4
+            $strReq = 'UPDATE ' . $core->prefix . 'setting ' .
+                " SET setting_value = '1.12.4' " .
+                " WHERE setting_id = 'jquery_version' " .
+                " AND setting_ns = 'system' " .
+                " AND setting_value = '1.11.3' ";
+            $core->con->execute($strReq);
+        }
+
         $core->setVersion('core', DC_VERSION);
         $core->blogDefaults();

inc/dbschema/upgrade.php

@@ -688 +688 @@
         }
 
+        if (version_compare($version, '2.14.2', '<')) {
+            # Update flie exclusion upload regex
+            $strReq = 'UPDATE ' . $core->prefix . 'setting ' .
+                " SET setting_value = '/\\.(phps?|pht(ml)?|phl|.?html?|js|htaccess)[0-9]*\$/i' " .
+                " WHERE setting_id = 'media_exclusion' " .
+                " AND setting_ns = 'system' " .
+                " AND (setting_value = '/\\.php[0-9]*\$/i' " .
+                "   OR setting_value = '/\\.php\$/i') " .
+                "   OR setting_value = '/\\.(phps?|pht(ml)?|phl)[0-9]*\$/i' " .
+                "   OR setting_value = '/\\.(phps?|pht(ml)?|phl|s?html?|js)[0-9]*\$/i'" .
+                "   OR setting_value = '/\\.(phps?|pht(ml)?|phl|s?html?|js|htaccess)[0-9]*\$/i'";
+            $core->con->execute($strReq);
+        }
+
         if (version_compare($version, '2.15', '<')) {
             # switch from jQuery 1.11.3 to 1.12.4