diff options
author | Chanaka Indrajith <pe.chanaka.ck@gmail.com> | 2012-05-13 11:09:31 +0400 |
---|---|---|
committer | Chanaka Indrajith <pe.chanaka.ck@gmail.com> | 2012-05-13 11:09:31 +0400 |
commit | dd237eb9243dee3d2fcca7a65e338ab9938137c7 (patch) | |
tree | 37ec825430ac703ba28e9ad336f65a79d3aefc54 /tbl_change.php | |
parent | 40d0ada69bed5856d75d6b67bb3fc0a1e1df943c (diff) | |
parent | 74c2148917dc5d325c6656f2a4a5f15cd5f970aa (diff) |
Resolve conflicts due to changes in method names of common.lib.php
Diffstat (limited to 'tbl_change.php')
-rw-r--r-- | tbl_change.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tbl_change.php b/tbl_change.php index 54c89cdc48..d0b70e0240 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -526,7 +526,7 @@ foreach ($rows as $row_id => $vrow) { $special_chars = ''; $data = $vrow[$field['Field']]; } elseif ($field['True_Type'] == 'bit') { - $special_chars = PMA_printable_bit_value( + $special_chars = PMA_printableBitValue( $vrow[$field['Field']], $extracted_columnspec['spec_in_brackets'] ); } elseif (in_array($field['True_Type'], $gis_data_types)) { @@ -540,7 +540,7 @@ foreach ($rows as $row_id => $vrow) { $vrow[$field['Field']] = bin2hex($vrow[$field['Field']]); $field['display_binary_as_hex'] = true; } else { - $vrow[$field['Field']] = PMA_replace_binary_contents($vrow[$field['Field']]); + $vrow[$field['Field']] = PMA_replaceBinaryContents($vrow[$field['Field']]); } } // end if $special_chars = htmlspecialchars($vrow[$field['Field']]); @@ -576,7 +576,7 @@ foreach ($rows as $row_id => $vrow) { $data = $field['Default']; } if ($field['True_Type'] == 'bit') { - $special_chars = PMA_convert_bit_default_value($field['Default']); + $special_chars = PMA_convertBitDefaultValue($field['Default']); } else { $special_chars = htmlspecialchars($field['Default']); } |