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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2013-06-16 14:12:35 +02:00
commit 0e99869184
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
export.php
View File

@ -421,9 +421,9 @@ if ($onfly_compression) {
$memory_limit = (int)$memory_limit;
}
// Some of memory is needed for other thins and as treshold.
// Nijel: During export I had allocated (see memory_get_usage function)
// approx 1.2MB so this comes from that.
// Some of memory is needed for other things and as threshold.
// During export I had allocated (see memory_get_usage function)
// approx 1.2MB so this comes from that.
if ($memory_limit > 1500000) {
$memory_limit -= 1500000;
}

2
import.php
View File

@ -571,7 +571,7 @@ if (isset($message)) {
// (but if the query is too large, in case of an imported file, the parser
// can choke on it so avoid parsing)
if (strlen($sql_query) <= $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) {
include_once 'libraries/parse_analyze.lib.php';
include_once 'libraries/parse_analyze.inc.php';
}
// There was an error?

4
index.php
View File

@ -405,7 +405,7 @@ if ($server != 0
}
/**
* Nijel: As we try to handle charsets by ourself, mbstring overloads just
* As we try to handle charsets by ourself, mbstring overloads just
* break it, see bug 1063821.
*/
if (@extension_loaded('mbstring') && @ini_get('mbstring.func_overload') > 1) {
@ -420,7 +420,7 @@ if (@extension_loaded('mbstring') && @ini_get('mbstring.func_overload') > 1) {
}
/**
* Nijel: mbstring is used for handling multibyte inside parser, so it is good
* mbstring is used for handling multibyte inside parser, so it is good
* to tell user something might be broken without it, see bug #1063149.
*/
if (! @extension_loaded('mbstring')) {

2
libraries/parse_analyze.lib.php → libraries/parse_analyze.inc.php
View File

@ -96,7 +96,7 @@ if ($is_select) {
} else {
$db = $prev_db;
}
// Nijel: don't change reload, if we already decided to reload in import
// Don't change reload, if we already decided to reload in import
if (empty($reload) && empty($GLOBALS['is_ajax_request'])) {
$reload = ($db == $prev_db) ? 0 : 1;
}

6
libraries/sql.lib.php
View File

@ -91,7 +91,7 @@ function getTableHtmlForMultipleQueries(
$querytime_before = array_sum(explode(' ', microtime()));
// Assignment for variable is not needed since the results are
// looiping using the connection
// looping using the connection
@$GLOBALS['dbi']->tryMultiQuery($multi_sql);
$querytime_after = array_sum(explode(' ', microtime()));
@ -123,11 +123,11 @@ function getTableHtmlForMultipleQueries(
$tables_array
);
// for the use of the parse_analyze.lib.php
// for the use of the parse_analyze.inc.php
$sql_query = $sql_data['valid_sql'][$sql_no];
// Parse and analyze the query
require_once 'libraries/parse_analyze.lib.php';
require 'libraries/parse_analyze.inc.php';
$unlim_num_rows = PMA_Table::countRecords($db, $table, true);
$showtable = PMA_Table::sGetStatusInfo($db, $table, null, true);

2
sql.php
View File

@ -202,7 +202,7 @@ if (empty($sql_query) && strlen($table) && strlen($db)) {
/**
* Parse and analyze the query
*/
require_once 'libraries/parse_analyze.lib.php';
require_once 'libraries/parse_analyze.inc.php';
/**