Changeset 3126:19af5f62e940 for inc/dbschema/upgrade.php

Timestamp:

10/25/15 10:09:44 (10 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Children:

3128:3863cfaaae8d, 3130:dc667b6545bf

Parents:

3118:5c671c6fae8a (diff), 3125:3491c455735d (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.8.2 into 2.9 (default)

Files:

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

inc/dbschema/upgrade.php

@@ -455 +455 @@
                }
 
+               if (version_compare($version,'2.8.1','<'))
+               {
+                    # Update flie exclusion upload regex
+                    $strReq = 'UPDATE '.$core->prefix.'setting '.
+                              " SET setting_value = '/\\.(phps?|pht(ml)?|phl)[0-9]*\$/i' ".
+                              " WHERE setting_id = 'media_exclusion' ".
+                              " AND setting_ns = 'system' ".
+                              " AND (setting_value = '/\\.php[0-9]*\$/i' ".
+                              "   OR setting_value = '/\\.php\$/i') ";
+                    $core->con->execute($strReq);
+               }
+
                if (version_compare($version,'2.9','<'))
                {

inc/dbschema/upgrade.php

@@ -467 +467 @@
                }
 
+               if (version_compare($version,'2.9','<'))
+               {
+                    # Some new settings should be initialized, prepare db queries
+                    $strReq = 'INSERT INTO '.$core->prefix.'setting'.
+                              ' (setting_id,setting_ns,setting_value,setting_type,setting_label)'.
+                              ' VALUES(\'%s\',\'system\',\'%s\',\'integer\',\'%s\')';
+                    $core->con->execute(sprintf($strReq,'media_video_width','400','Media video insertion width'));
+                    $core->con->execute(sprintf($strReq,'media_video_height','300','Media video insertion height'));
+               }
+
                $core->setVersion('core',DC_VERSION);
                $core->blogDefaults();