fix post-install script

PEAR_Server/Server

diff -u -r1.31 -r1.32
--- mysqlinstall.php	4 Feb 2006 03:06:00 -0000	1.31
+++ mysqlinstall.php	4 Feb 2006 03:24:38 -0000	1.32
@@ -313,6 +313,38 @@

                         }
                         $this->fixHandles = true;
                     }

+                    // channel field size upgrade
+                    if (extension_loaded('mysqli')) {
+                        $query = @mysqli_query($conn, 'SHOW COLUMNS FROM maintainers');
+                        while ($res = mysqli_fetch_array($query, MYSQLI_ASSOC)) {
+                            if ($res['Field'] == 'channel') {
+                                if ($res['Type'] == 'varchar(255)') {
+                                    $upgraded = true;
+                                } else {
+                                    $upgraded = false;
+                                }
+                            }
+                        }
+                    } else {
+                        $query = @mysql_query('SHOW COLUMNS FROM maintainers', $conn);
+                        while ($res = mysql_fetch_array($query, MYSQLI_ASSOC)) {
+                            if ($res['Field'] == 'channel') {
+                                if ($res['Type'] == 'varchar(255)') {
+                                    $upgraded = true;
+                                } else {
+                                    $upgraded = false;
+                                }
+                            }
+                        }
+                    }
+                    if (!$upgraded) {
+                        $a = $this->updateDatabase(
+                            '@data-dir@/Chiara_PEAR_Server/data/maintainers-channel-0.18.4.sql',
+                            'updating database to increase size of channel field', $conn);
+                        if (!$a) {
+                            return $a;
+                        }
+                    }

                     // REST support upgrade
                     if (extension_loaded('mysqli')) {
                         $query = @mysqli_query($conn, 'SELECT rest_support FROM channels');

@@ -351,38 +383,6 @@

                             return $a;
                         }
                     }

-                    // channel field size upgrade
-                    if (extension_loaded('mysqli')) {
-                        $query = @mysqli_query($conn, 'SHOW COLUMNS FROM maintainers');
-                        while ($res = mysqli_fetch_array($query, MYSQLI_ASSOC)) {
-                            if ($res['Field'] == 'channel') {
-                                if ($res['Type'] == 'varchar(255)') {
-                                    $upgraded = true;
-                                } else {
-                                    $upgraded = false;
-                                }
-                            }
-                        }
-                    } else {
-                        $query = @mysql_query('SHOW COLUMNS FROM maintainers', $conn);
-                        while ($res = mysql_fetch_array($query, MYSQLI_ASSOC)) {
-                            if ($res['Field'] == 'channel') {
-                                if ($res['Type'] == 'varchar(255)') {
-                                    $upgraded = true;
-                                } else {
-                                    $upgraded = false;
-                                }
-                            }
-                        }
-                    }
-                    if (!$upgraded) {
-                        $a = $this->updateDatabase(
-                            '@data-dir@/Chiara_PEAR_Server/data/maintainers-channel-0.18.4.sql',
-                            'updating database to increase size of channel field', $conn);
-                        if (!$a) {
-                            return $a;
-                        }
-                    }

                     return $this->checkSetup();
                 }
             } else {