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 2014-01-24 14:24:27 +01:00
commit a60b854f90
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/DatabaseInterface.class.php
View File

@ -68,7 +68,7 @@ class PMA_DatabaseInterface
/**
* runs a query
*
* @param string $query SQL query to execte
* @param string $query SQL query to execute
* @param mixed $link optional database link to use
* @param int $options optional query options
* @param bool $cache_affected_rows whether to cache affected rows

4
libraries/DisplayResults.class.php
View File

@ -3131,7 +3131,7 @@ class PMA_DisplayResults
$linking_url_params[$link_relations['link_param']] = $column_value;
} else {
// Consider only the case of creating link for column field
// sql query need to be pass as url param
// sql query that needs to be passed as url param
$sql = 'SELECT `' . $column_value . '` FROM `'
. $row_info[$link_relations['link_param'][1]] . '`.`'
. $row_info[$link_relations['link_param'][2]] . '`';
@ -4900,7 +4900,7 @@ class PMA_DisplayResults
/**
* Set the content need to be show in message
* Set the content that needs to be shown in message
*
* @param string $sorted_column_message the message for sorted column
* @param string $limit_clause the limit clause of analyzed query

12
libraries/sql.lib.php
View File

@ -792,7 +792,7 @@ function PMA_getHtmlForBookmark($disp_mode, $cfgBookmark, $sql_query, $db, $tabl
/**
* Function to check whether to remember the sorting order or not
*
* @param array $analyzed_sql_results the analyzed query and other varibles set
* @param array $analyzed_sql_results the analyzed query and other variables set
* after analyzing the query
*
* @return boolean
@ -821,7 +821,7 @@ function PMA_isRememberSortingOrder($analyzed_sql_results)
/**
* Function to check whether the LIMIT clause should be appended or not
*
* @param array $analyzed_sql_results the analyzed query and other varibles set
* @param array $analyzed_sql_results the analyzed query and other variables set
* after analyzing the query
*
* @return boolean
@ -847,7 +847,7 @@ function PMA_isAppendLimitClause($analyzed_sql_results)
/**
* Function to check whether this query is for just browsing
*
* @param array $analyzed_sql_results the analyzed query and other varibles set
* @param array $analyzed_sql_results the analyzed query and other variables set
* after analyzing the query
* @param boolean $find_real_end whether the real end should be found
*
@ -879,7 +879,7 @@ function PMA_isJustBrowsing($analyzed_sql_results, $find_real_end)
/**
* Function to check whether the reated transformation information shoul be deleted
*
* @param array $analyzed_sql_results the analyzed query and other varibles set
* @param array $analyzed_sql_results the analyzed query and other variables set
* after analyzing the query
*
* @return boolean
@ -899,7 +899,7 @@ function PMA_isDeleteTransformationInfo($analyzed_sql_results)
/**
* Function to check whether the user has rights to drop the database
*
* @param array $analyzed_sql_results the analyzed query and other varibles set
* @param array $analyzed_sql_results the analyzed query and other variables set
* after analyzing the query
* @param boolean $allowUserDropDatabase whether the user is allowed to drop db
* @param boolean $is_superuser whether this user is a superuser
@ -1372,7 +1372,7 @@ function PMA_cleanupRelations($db, $table, $dropped_column, $purge, $extra_data)
* @param string $db the current database
* @param string $table the current table
* @param array $parsed_sql parsed sql
* @param array $analyzed_sql_results the analyzed query and other varibles set
* @param array $analyzed_sql_results the analyzed query and other variables set
* after analyzing the query
*
* @return int $unlim_num_rows unlimited number of rows

2
test/classes/PMA_Message_test.php
View File

@ -511,7 +511,7 @@ class PMA_Message_Test extends PHPUnit_Framework_TestCase
}
/**
* testing display method (output string and _is_displayed varible)
* testing display method (output string and _is_displayed variable)
*
* @return void
*/

2
test/classes/plugin/import/ImportOds_test.php
View File

@ -71,7 +71,7 @@ class ImportOds_Test extends PHPUnit_Framework_TestCase
$GLOBALS['import_type'] = 'ods';
$GLOBALS['import_handle'] = @fopen($GLOBALS['import_file'], 'r');
//varible for Ods
//variable for Ods
$_REQUEST['ods_recognize_percentages'] = true;
$_REQUEST['ods_recognize_currency'] = true;
$_REQUEST['ods_empty_rows'] = true;

2
test/libraries/PMA_relation_cleanup_test.php
View File

@ -394,7 +394,7 @@ class DBI_PMA_Relation_Cleanup extends PMA_DatabaseInterface
/**
* runs a query
*
* @param string $sql SQL query to execte
* @param string $sql SQL query to execute
* @param mixed $link optional database link to use
* @param int $options optional query options
* @param bool $cache_affected_rows whether to cache affected rows