Arguments with default values must be at the end of the argument list - more instances

madhuracj · madhuracj · commit 968294b08bdb · 2012-05-10T22:09:13.000+05:30
diff --git a/libraries/Table.class.php b/libraries/Table.class.php
@@ -365,6 +365,7 @@ static public function sGetStatusInfo($db, $table, $info = null, $force_read = f
      *
      * @param string      $name           name
      * @param string      $type           type ('INT', 'VARCHAR', 'BIT', ...)
+     * @param string      $index
      * @param string      $length         length ('2', '5,2', '', ...)
      * @param string      $attribute      attribute
      * @param string      $collation      collation
@@ -376,7 +377,6 @@ static public function sGetStatusInfo($db, $table, $info = null, $force_read = f
      * @param string      $extra          'AUTO_INCREMENT'
      * @param string      $comment        field comment
      * @param array       &$field_primary list of fields for PRIMARY KEY
-     * @param string      $index
      * @param mixed       $default_orig
      * @param string      $move_to        new position for column
      *
@@ -386,10 +386,10 @@ static public function sGetStatusInfo($db, $table, $info = null, $force_read = f
      *
      * @return string  field specification
      */
-    static function generateFieldSpec($name, $type, $length = '', $attribute = '',
+    static function generateFieldSpec($name, $type, $index, $length = '', $attribute = '',
         $collation = '', $null = false, $default_type = 'USER_DEFINED',
         $default_value = '', $extra = '', $comment = '',
-        &$field_primary = null, $index, $default_orig, $move_to
+        &$field_primary = null, $default_orig = '', $move_to = ''
     ) {
         $is_timestamp = strpos(strtoupper($type), 'TIMESTAMP') !== false;
 
@@ -616,9 +616,9 @@ static public function generateAlter($oldcol, $newcol, $type, $length,
     ) {
         return PMA_backquote($oldcol) . ' '
             . PMA_Table::generateFieldSpec(
-                $newcol, $type, $length, $attribute,
+                $newcol, $type, $index, $length, $attribute,
                 $collation, $null, $default_type, $default_value, $extra,
-                $comment, $field_primary, $index, $default_orig, $move_to
+                $comment, $field_primary, $default_orig, $move_to
             );
     } // end function
 
diff --git a/tbl_addfield.php b/tbl_addfield.php
@@ -81,6 +81,7 @@
         $definition = ' ADD ' . PMA_Table::generateFieldSpec(
             $_REQUEST['field_name'][$i],
             $_REQUEST['field_type'][$i],
+            $i,
             $_REQUEST['field_length'][$i],
             $_REQUEST['field_attribute'][$i],
             isset($_REQUEST['field_collation'][$i])
@@ -98,7 +99,6 @@
                 ? $_REQUEST['field_comments'][$i]
                 : '',
             $field_primary,
-            $i
         );
 
         if ($_REQUEST['field_where'] != 'last') {
diff --git a/tbl_create.php b/tbl_create.php
@@ -91,6 +91,7 @@
         $query = PMA_Table::generateFieldSpec(
             $_REQUEST['field_name'][$i],
             $_REQUEST['field_type'][$i],
+            $i,
             $_REQUEST['field_length'][$i],
             $_REQUEST['field_attribute'][$i],
             isset($_REQUEST['field_collation'][$i])
@@ -108,7 +109,6 @@
                 ? $_REQUEST['field_comments'][$i]
                 : '',
             $field_primary,
-            $i,
             '',
             ''
         );
