### Eclipse Workspace Patch 1.0
#P moodlecvs
Index: login/signup_form.php
===================================================================
RCS file: /cvsroot/moodle/moodle/login/signup_form.php,v
retrieving revision 1.52
diff -u -r1.52 signup_form.php
--- login/signup_form.php	28 Jun 2010 14:38:47 -0000	1.52
+++ login/signup_form.php	30 Jun 2010 08:45:43 -0000
@@ -54,7 +54,7 @@
         $mform->setType('lastname', PARAM_TEXT);
         $mform->addRule('lastname', get_string('missinglastname'), 'required', null, 'server');
 
-        $mform->addElement('text', 'city', get_string('city'), 'maxlength="20" size="20"');
+        $mform->addElement('text', 'city', get_string('city'), 'maxlength="100" size="20"');
         $mform->setType('city', PARAM_TEXT);
         $mform->addRule('city', get_string('missingcity'), 'required', null, 'server');
 
Index: lib/db/install.xml
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/db/install.xml,v
retrieving revision 1.258
diff -u -r1.258 install.xml
--- lib/db/install.xml	25 Jun 2010 11:36:53 -0000	1.258
+++ lib/db/install.xml	30 Jun 2010 08:45:42 -0000
@@ -726,7 +726,7 @@
         <FIELD NAME="institution" TYPE="char" LENGTH="40" NOTNULL="true" SEQUENCE="false" PREVIOUS="phone2" NEXT="department"/>
         <FIELD NAME="department" TYPE="char" LENGTH="30" NOTNULL="true" SEQUENCE="false" PREVIOUS="institution" NEXT="address"/>
         <FIELD NAME="address" TYPE="char" LENGTH="70" NOTNULL="true" SEQUENCE="false" PREVIOUS="department" NEXT="city"/>
-        <FIELD NAME="city" TYPE="char" LENGTH="20" NOTNULL="true" SEQUENCE="false" PREVIOUS="address" NEXT="country"/>
+        <FIELD NAME="city" TYPE="char" LENGTH="100" NOTNULL="true" SEQUENCE="false" PREVIOUS="address" NEXT="country"/>
         <FIELD NAME="country" TYPE="char" LENGTH="2" NOTNULL="true" SEQUENCE="false" PREVIOUS="city" NEXT="lang"/>
         <FIELD NAME="lang" TYPE="char" LENGTH="30" NOTNULL="true" DEFAULT="en" SEQUENCE="false" PREVIOUS="country" NEXT="theme"/>
         <FIELD NAME="theme" TYPE="char" LENGTH="50" NOTNULL="true" SEQUENCE="false" PREVIOUS="lang" NEXT="timezone"/>
Index: lib/db/upgrade.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/db/upgrade.php,v
retrieving revision 1.428
diff -u -r1.428 upgrade.php
--- lib/db/upgrade.php	27 Jun 2010 09:30:59 -0000	1.428
+++ lib/db/upgrade.php	30 Jun 2010 08:45:43 -0000
@@ -4846,7 +4846,28 @@
         upgrade_main_savepoint($result, 2010062101);
     }
 
+    if ($result && $oldversion < 2010062102) {
+    /// Before changing the field, drop dependent indexes
+    /// Define index shortname (not unique) to be dropped form course_request
+        $table = new xmldb_table('user');
+    	$index = new xmldb_index('city', XMLDB_INDEX_NOTUNIQUE, array('city'));
+    /// Conditionally launch drop index shortname
+        if ($dbman->index_exists($table, $index)) {
+            $dbman->drop_index($table, $index);
+        }
+    /// Changing precision of field city on table user to (100)
+        $field = new xmldb_field('city', XMLDB_TYPE_CHAR, '100', null, XMLDB_NOTNULL, null, null, 'address');
 
+    /// Launch change of precision for field city
+        $dbman->change_field_precision($table, $field);
+        
+    /// Conditionally launch add index typeitem_ix
+        if (!$dbman->index_exists($table, $index)) {
+            $dbman->add_index($table, $index);
+        }
+    /// Main savepoint reached
+        upgrade_main_savepoint($result, 2010062102);
+    }
 
     return $result;
 }
Index: lib/moodlelib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/moodlelib.php,v
retrieving revision 1.1403
diff -u -r1.1403 moodlelib.php
--- lib/moodlelib.php	30 Jun 2010 06:35:47 -0000	1.1403
+++ lib/moodlelib.php	30 Jun 2010 08:45:40 -0000
@@ -3389,7 +3389,7 @@
                     'institution' =>  40,
                     'department'  =>  30,
                     'address'     =>  70,
-                    'city'        =>  20,
+                    'city'        => 100,
                     'country'     =>   2,
                     'url'         => 255,
                     );
Index: user/editlib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/user/editlib.php,v
retrieving revision 1.39
diff -u -r1.39 editlib.php
--- user/editlib.php	23 Jun 2010 09:28:32 -0000	1.39
+++ user/editlib.php	30 Jun 2010 08:45:43 -0000
@@ -186,7 +186,7 @@
     $mform->addElement('select', 'screenreader', get_string('screenreaderuse'), $choices);
     $mform->setDefault('screenreader', 0);
 
-    $mform->addElement('text', 'city', get_string('city'), 'maxlength="20" size="21"');
+    $mform->addElement('text', 'city', get_string('city'), 'maxlength="100" size="21"');
     $mform->setType('city', PARAM_MULTILANG);
     $mform->addRule('city', $strrequired, 'required', null, 'client');
 
Index: version.php
===================================================================
RCS file: /cvsroot/moodle/moodle/version.php,v
retrieving revision 1.1634
diff -u -r1.1634 version.php
--- version.php	30 Jun 2010 00:44:46 -0000	1.1634
+++ version.php	30 Jun 2010 08:45:38 -0000
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-    $version = 2010062101;  // YYYYMMDD   = date of the last version bump
+    $version = 2010062102;  // YYYYMMDD   = date of the last version bump
                             //         XX = daily increments
 
     $release = '2.0 Preview 3 (Build: 20100630)';  // Human-friendly version name