diff --git a/ChangeLog b/ChangeLog index 445ba64262..5dd8fd320f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ phpMyAdmin - ChangeLog + rfe #3507804 Session upload progress (PHP 5.4) + rfe #3488185 draggable columns vs copy column name + Patch #3507001 Contest-4: Textarea for large character columns ++ Removed the PHP version of the ENUM editor 3.5.1.0 (not yet released) - bug #3510784 [edit] Limit clause ignored when sort order is remembered diff --git a/enum_editor.php b/enum_editor.php deleted file mode 100644 index e0da559afc..0000000000 --- a/enum_editor.php +++ /dev/null @@ -1,149 +0,0 @@ - - - -
- - -
- -
-

- -

-

- - $value) { - $values[$key] = htmlentities($value); - } - // If the values are in a string - } elseif (isset($_GET['values']) && is_string($_GET['values'])) { - // then this page was called via a link from some external page - $values_string = htmlentities($_GET['values']); - // There is a JS port of the below parser in functions.js - // If you are fixing something here, - // you need to also update the JS port. - $values = array(); - $in_string = false; - $buffer = ''; - for ($i=0; $i 0) { - // The leftovers in the buffer are the last value (if any) - $values[] = $buffer; - } - } - // Escape double quotes - foreach ($values as $key => $value) { - $values[$key] = str_replace('"', ""e;", $value); - } - // If there are no values, maybe the user is about to make a - // new list so we add a few for him/her to get started with. - if (! count($values) - || (count($values) == 1 && strlen($values[0]) == 0) - ) { - array_push($values, '', '', ''); - } - // Add an empty value, if there was a request to do so - if (! empty($_GET['add_field'])) { - $values[] = ''; - } - // Remove a value, given a valid index, from the list - // of values, if there was a request to do so. - if (isset($_GET['drop']) && is_array($_GET['drop'])) { - foreach ($_GET['drop'] as $index => $value) { - if ((int)$index == $index - && $index > 0 - && $index <= count($values) - ) { - unset($values[$index]); - } - } - } - // Display the values in text fields - $field_counter = 0; - foreach ($values as $value) { - $field_counter++; - echo sprintf( - '' . "\n"; - } - ?> - -
' . "\n", - $value - ); - echo ''; - echo '' . "\n"; - echo '
- - - -
-
-
-
-

-

- $value) { - $values[$key] = "'"; - $values[$key] .= str_replace( - array("'", "\\", "'", "\"), - array("''", '\\\\', "''", '\\\\'), - $value - ); - $values[$key] .= "'"; - } - // Print out the values as a string - ?> - -
-
-
- - diff --git a/js/functions.js b/js/functions.js index 25f0bb1072..d9c50219a3 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2523,9 +2523,6 @@ $(document).ready(function() { .html(); // Parse the values, escaping quotes and // slashes on the fly, into an array - // - // There is a PHP port of the below parser in enum_editor.php - // If you are fixing something here, you need to also update the PHP port. var values = []; var in_string = false; var curr, next, buffer = ''; diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index a19faae274..2ab9a22729 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -685,8 +685,7 @@ function PMA_RTN_getParameterRow($routine = array(), $index = null, $class = '') $retval .= " name='item_param_length[$index]' type='text'\n"; $retval .= " value='{$routine['item_param_length'][$i]}' />\n"; $retval .= "
\n"; - $retval .= " \n"; + $retval .= " \n"; $retval .= " " . PMA_getImage('b_edit', '', array('title'=>__('ENUM/SET editor'))) . "\n"; $retval .= " \n"; $retval .= "
\n"; diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index f716c0f7f5..ae287f8608 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -319,11 +319,7 @@ for ($i = 0; $i < $num_fields; $i++) { . ' class="textfield" />' . '

'; $content_cells[$i][$ci] .= __('ENUM or SET data too long?') - . ' ' + . ' ' . __('Get more editing space') . '' . '

'; $ci++;