webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-28 07:41:55 +03:00
Code Activity

correct wrong function signature

Browse Source
This commit is contained in:
Thilina Buddika
2012-06-16 10:56:47 +05:30
parent a7d063e7bf
commit fa2bcbc5e6
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/insert_edit.lib.php
View File

@@ -1339,7 +1339,7 @@ function PMA_getAfterInsertDropDown($where_clause, $after_insert, $found_unique_
//if (preg_match('@^[\s]*`[^`]*` = [0-9]+@', $where_clause)) {
// in 2.9.0, we are looking for `table_name`.`field_name` = numeric_value
$is_numeric = false;
if(!is_array($where_clause)) {
if(! is_array($where_clause)) {
$is_numeric = $found_unique_key && preg_match('@^[\s]*`[^`]*`[\.]`[^`]*` = [0-9]+@', $where_clause);
} else {
for ($i = 0; $i < count($where_clause); $i++) {
@@ -1755,7 +1755,7 @@ function PMA_getWarningMessages()
*
* @return string $dispval display value from the foriegn table
*/
function PMA_getDisplayValueForForiengTableColumn($where_comparison, $relation_field_value, $map, $relation_field)
function PMA_getDisplayValueForForeignTableColumn($where_comparison, $relation_field_value, $map, $relation_field)
{
$display_field = PMA_getDisplayField($map[$relation_field]['foreign_db'], $map[$relation_field]['foreign_table']);
// Field to display from the foreign table?

8
tbl_change.php
View File

@@ -186,14 +186,14 @@ $html_output .= '<script src="js/keyhandler.js" type="text/javascript"></script>
. 'document.onkeydown = onKeyDownArrowsHandler;'
. '</script>';
// Set if we passed the first timestamp field
$timestamp_seen = 0;
$columns_cnt = count($table_fields);
$timestamp_seen = 0;
$columns_cnt = count($table_fields);
$tabindex = 0;
$tabindex = 0;
$tabindex_for_function = +3000;
$tabindex_for_null = +6000;
$tabindex_for_value = 0;
$o_rows = 0;
$o_rows = 0;
$biggest_max_file_size = 0;
$url_params['db'] = $db;

2
tbl_replace.php
View File

@@ -270,7 +270,7 @@ if ($GLOBALS['is_ajax_request'] == true) {
foreach ( $relation_fields as $cell_index => $curr_cell_rel_field) {
foreach ( $curr_cell_rel_field as $relation_field => $relation_field_value) {
$where_comparison = "='" . $relation_field_value . "'";
$dispval = PMA_displayForiengTableColumn($where_comparison, $relation_field_value, $map, $relation_field);
$dispval = PMA_getDisplayValueForForeignTableColumn($where_comparison, $relation_field_value, $map, $relation_field);
$extra_data['relations'][$cell_index] = PMA_getLinkForRelationalDisplayField(
$map, $relation_field, $where_comparison, $dispval, $relation_field_value