Changeset 3128:3863cfaaae8d

Timestamp:

10/25/15 21:41:59 (10 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

3126:19af5f62e940 (diff), 3127:6f6550a613ea (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

Files:

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

inc/dbschema/upgrade.php

@@ -432 +432 @@
                }
 
-               if (version_compare($version,'2.8','<'))
+               if (version_compare($version,'2.8.1','<='))
                {
                     # switch from jQuery 1.11.1 to 1.11.2
@@ -455 +455 @@
                }
 
-               if (version_compare($version,'2.8.1','<'))
+               if (version_compare($version,'2.8.2','<='))
                {
                     # Update flie exclusion upload regex

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();