gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The term "properties" has another meaning in phpMyAdmin 4.x

Browse Source
This commit is contained in:
Marc Delisle 2012-12-20 09:46:10 -05:00
parent 796fda0712
commit 58c6fa955e
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/structure.lib.php
View File

@ -2272,8 +2272,10 @@ function PMA_displayHtmlForColumnChange($db, $table, $selected, $action)
$fields_meta[] = PMA_DBI_get_columns($db, $table, $selected[$i], true);
}
$num_fields = count($fields_meta);
// set these globals because tbl_properties.inc.php verifies them
// @todo: refactor tbl_properties.inc.php so that it uses function params
// set these globals because tbl_columns_definition_form.inc.php
// verifies them
// @todo: refactor tbl_columns_definition_form.inc.php so that it uses
// function params
$GLOBALS['action'] = 'tbl_structure.php';
$GLOBALS['num_fields'] = $num_fields;
@ -2300,7 +2302,7 @@ function PMA_displayHtmlForColumnChange($db, $table, $selected, $action)
/**
* Form for changing properties.
*/
include 'libraries/tbl_properties.inc.php';
include 'libraries/tbl_columns_definition_form.inc.php';
}
@ -2440,7 +2442,8 @@ function PMA_updateColumns($db, $table)
PMA_Util::mysqlDie('', '', '', $err_url, false);
// An error happened while inserting/updating a table definition.
// to prevent total loss of that data, we embed the form once again.
// The variable $regenerate will be used to restore data in libraries/tbl_properties.inc.php
// The variable $regenerate will be used to restore data in
// libraries/tbl_columns_definition_form.inc.php
// @todo: test this code, now that it's inside a function
if (isset($_REQUEST['orig_field'])) {
$_REQUEST['field'] = $_REQUEST['orig_field'];

0
libraries/tbl_properties.inc.php → libraries/tbl_columns_definition_form.inc.php
View File

4
tbl_addfield.php
View File

@ -207,7 +207,7 @@ if (isset($_REQUEST['do_save_data'])) {
}
// An error happened while inserting/updating a table definition.
// to prevent total loss of that data, we embed the form once again.
// The variable $regenerate will be used to restore data in libraries/tbl_properties.inc.php
// The variable $regenerate will be used to restore data in libraries/tbl_columns_definition_form.inc.php
$num_fields = $_REQUEST['orig_num_fields'];
if (isset($_REQUEST['orig_after_field'])) {
$_REQUEST['after_field'] = $_REQUEST['orig_after_field'];
@ -234,7 +234,7 @@ if ($abort == false) {
* Display the form
*/
$action = 'tbl_addfield.php';
include_once 'libraries/tbl_properties.inc.php';
include_once 'libraries/tbl_columns_definition_form.inc.php';
}
?>

6
tbl_create.php
View File

@ -40,7 +40,7 @@ $err_url = 'tbl_create.php?' . PMA_generate_common_url($db, $table);
// check number of fields to be created
if (isset($_REQUEST['submit_num_fields'])) {
$regenerate = true; // for libraries/tbl_properties.inc.php
$regenerate = true; // for libraries/tbl_columns_definition_form.inc.php
$num_fields = $_REQUEST['orig_num_fields'] + $_REQUEST['added_fields'];
} elseif (isset($_REQUEST['num_fields']) && intval($_REQUEST['num_fields']) > 0) {
$num_fields = (int) $_REQUEST['num_fields'];
@ -424,7 +424,7 @@ if (isset($_REQUEST['do_save_data'])) {
// An error happened while inserting/updating a table definition.
// To prevent total loss of that data, we embed the form once again.
// The variable $regenerate will be used to restore data in
// libraries/tbl_properties.inc.php
// libraries/tbl_columns_definition_form.inc.php
$num_fields = $_REQUEST['orig_num_fields'];
$regenerate = true;
}
@ -442,7 +442,7 @@ if ($GLOBALS['is_ajax_request'] != true) {
echo('<div id="create_table_div">');
}
require 'libraries/tbl_properties.inc.php';
require 'libraries/tbl_columns_definition_form.inc.php';
if ($GLOBALS['is_ajax_request'] != true) {
echo('</div>');