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

Merge remote branch 'origin/master'

Browse Source
This commit is contained in:
Pootle server
2010-05-05 16:40:12 +02:00
parent ba344b8a2e 149c75f91f
commit c602902167
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libraries/common.lib.php
View File

@@ -1508,7 +1508,7 @@ function PMA_formatNumber($value, $length = 3, $comma = 0, $only_down = false)
* *
* @param string $size the size expression (for example 8MB) * @param string $size the size expression (for example 8MB)
* @uses PMA_pow() * @uses PMA_pow()
* @return integer The numerical part of the expression (for example 8) * @return integer The numerical part of the expression (for example 8)
*/ */
function PMA_extractValueFromFormattedSize($formatted_size) function PMA_extractValueFromFormattedSize($formatted_size)
{ {
@@ -1936,8 +1936,8 @@ function PMA_checkParameters($params, $die = true, $request = true)
if (!isset($GLOBALS[$param])) { if (!isset($GLOBALS[$param])) {
$error_message .= $reported_script_name $error_message .= $reported_script_name
. ': Missing parameter: ' . $param . ': Missing parameter: ' . $param
. ' <a href="./Documentation.html#faqmissingparameters"' . PMA_showDocu('faqmissingparameters')
. ' target="documentation"> (FAQ 2.8)</a><br />'; . '<br />';
$found_error = true; $found_error = true;
} }
} }
@@ -2600,19 +2600,19 @@ function PMA_printable_bit_value($value, $length) {
} }
/** /**
* Verifies whether the value contains a non-printable character * Verifies whether the value contains a non-printable character
* *
* @uses preg_match() * @uses preg_match()
* @param string $value * @param string $value
* @return boolean * @return boolean
*/ */
function PMA_contains_nonprintable_ascii($value) { function PMA_contains_nonprintable_ascii($value) {
return preg_match('@[^[:print:]]@', $value); return preg_match('@[^[:print:]]@', $value);
} }
/** /**
* Converts a BIT type default value * Converts a BIT type default value
* for example, b'010' becomes 010 * for example, b'010' becomes 010
* *
* @uses strtr() * @uses strtr()
* @param string $bit_default_value * @param string $bit_default_value

8
tbl_indexes.php
View File

@@ -156,9 +156,11 @@ echo PMA_generate_common_hidden_inputs($form_params);
<fieldset> <fieldset>
<legend> <legend>
<?php <?php
echo (isset($_REQUEST['create_index']) if (isset($_REQUEST['create_index'])) {
? __('Create a new index') echo __('Create a new index');
: __('Modify an index'); } else {
echo __('Modify an index');
}
?> ?>
</legend> </legend>