Changeset 1107:3943962d69b8 for inc/dbschema/upgrade.php

Timestamp:

02/27/13 11:48:32 (12 years ago)

Author:

JcDenis

Branch:

sexy

Parents:

880:02c78f56f430 (diff), 1105:ce855d61f9ce (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 with default branch in 2.5-RC

Files:

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

inc/dbschema/upgrade.php

@@ -277 +277 @@
                     $core->con->execute($strReq);
                }
+
+               if (version_compare($version,'2.5','<='))
+               {
+                    # Try to disable daInstaller plugin if it has been installed outside the default plugins directory
+                    $path = explode(PATH_SEPARATOR,DC_PLUGINS_ROOT);
+                    $default = path::real(dirname(__FILE__).'/../../plugins/');
+                    foreach ($path as $root)
+                    {
+                         if (!is_dir($root) || !is_readable($root)) {
+                              continue;
+                         }
+                         if (substr($root,-1) != '/') {
+                              $root .= '/';
+                         }
+                         if (($p = @dir($root)) === false) {
+                              continue;
+                         }
+                         if(path::real($root) == $default) {
+                              continue;
+                         }
+                         if (($d = @dir($root.'daInstaller')) === false) {
+                              continue;
+                         }
+                         $f = $root.'/daInstaller/_disabled';
+                         if (!file_exists($f))
+                         {
+                              @file_put_contents($f,'');
+                         }
+                    }
+               }
                
                $core->setVersion('core',DC_VERSION);

inc/dbschema/upgrade.php

@@ -41 +41 @@
                {
                     $strReq = 'SELECT media_id, media_file FROM '.$core->prefix.'media ';
-                    $rs_m = $core->con->select($strReq);
-                    while($rs_m->fetch()) {
+                    $medias = $core->con->select($strReq);
+                    foreach ($medias as $m) {
                          $cur = $core->con->openCursor($core->prefix.'media');
-                         $cur->media_dir = dirname($rs_m->media_file);
-                         $cur->update('WHERE media_id = '.(integer) $rs_m->media_id);
+                         $cur->media_dir = dirname($m->media_file);
+                         $cur->update('WHERE media_id = '.(integer) $m->media_id);
                     }
                }
@@ -61 +61 @@
                }
                
-               if (version_compare($version,'2.1-alpha2-r2383','<'))
-               {
-                    $schema = dbSchema::init($core->con);
-                    $schema->dropUnique($core->prefix.'category',$core->prefix.'uk_cat_title');
-                    
-                    # Reindex categories
-                    $rs = $core->con->select(
-                         'SELECT cat_id, cat_title, blog_id '.
-                         'FROM '.$core->prefix.'category '.
-                         'ORDER BY blog_id ASC , cat_position ASC '
-                    );
-                    $cat_blog = $rs->blog_id;
-                    $i = 2;
-                    while ($rs->fetch()) {
-                         if ($cat_blog != $rs->blog_id) {
-                              $i = 2;
-                         }
-                         $core->con->execute(
-                              'UPDATE '.$core->prefix.'category SET '
-                              .'cat_lft = '.($i++).', cat_rgt = '.($i++).' '.
-                              'WHERE cat_id = '.(integer) $rs->cat_id
-                         );
-                         $cat_blog = $rs->blog_id;
-                    }
-               }
                
                if (version_compare($version,'2.1.6','<='))
@@ -131 +106 @@
                          'WHERE (setting_id = \'widgets_nav\' OR setting_id = \'widgets_extra\') '.
                          'AND setting_ns = \'widgets\';';
-                    $rs = $core->con->select($sqlstr);
-                    while ($rs->fetch()) {
-                         $widgetsettings = base64_decode($rs->setting_value);
+                    $settings = $core->con->select($sqlstr);
+                    foreach ($settings as $s) {
+                         $widgetsettings = base64_decode($s->setting_value);
                          $widgetsettings = str_replace ('s:11:"tplMetadata"','s:7:"tplTags"',$widgetsettings);
                          $cur = $core->con->openCursor($core->prefix.'setting');
                          $cur->setting_value = base64_encode($widgetsettings);
-                         $sqlstr = 'WHERE setting_id = \''.$rs->setting_id.'\' AND setting_ns = \'widgets\' '.
+                         $sqlstr = 'WHERE setting_id = \''.$s->setting_id.'\' AND setting_ns = \'widgets\' '.
                          'AND blog_id ' .
-                         ($rs->blog_id == NULL ? 'is NULL' : '= \''.$core->con->escape($rs->blog_id).'\'');
+                         ($s->blog_id == NULL ? 'is NULL' : '= \''.$core->con->escape($s->blog_id).'\'');
                          $cur->update($sqlstr);
                     }
@@ -154 +129 @@
                     $init_fav['posts'] = array('posts','Entries','posts.php',
                          'images/menu/entries.png','images/menu/entries-b.png',
-                         'usage,contentadmin',null,null);
-                    $init_fav['comments'] = array('comments','Comments','comments.php',
-                         'images/menu/comments.png','images/menu/comments-b.png',
                          'usage,contentadmin',null,null);
                     $init_fav['prefs'] = array('prefs','My preferences','preferences.php',