Merge branch 'QA_4_4'

This commit is contained in:
Madhura Jayaratne 2015-05-07 07:58:27 +05:30
commit 11893d99dc
2 changed files with 5 additions and 5 deletions

View File

@ -32,6 +32,7 @@ phpMyAdmin - ChangeLog
4.4.6.0 (not yet released)
- bug #4890 webkitStorageInfo and webkitIndexedDB is deprecated
- bug #4892 Undefined variable: unique_conditions
4.4.5.0 (2015-05-05)
- bug Table overhead stats: missing space before the unit

View File

@ -2871,7 +2871,7 @@ class PMA_DisplayResults
$row_info = $this->_getRowInfoForSpecialLinks($row, $col_order);
$previousMetaOrgTable = '';
$uniqueConditionMap = array();
$columnCount = $this->__get('fields_cnt');
for ($currentColumn = 0;
@ -3024,8 +3024,7 @@ class PMA_DisplayResults
* costly and does not need to be called if we already know
* the conditions for the current table.
*/
if ($meta->orgtable != $previousMetaOrgTable) {
if (! isset($uniqueConditionMap[$meta->orgtable])) {
$unique_conditions = PMA_Util::getUniqueCondition(
$dt_result,
$this->__get('fields_cnt'),
@ -3034,13 +3033,13 @@ class PMA_DisplayResults
false,
$meta->orgtable
);
$previousMetaOrgTable = $meta->orgtable;
$uniqueConditionMap[$meta->orgtable] = $unique_conditions;
}
$transform_url_params = array(
'db' => $this->__get('db'),
'table' => $meta->orgtable,
'where_clause' => $unique_conditions[0],
'where_clause' => $uniqueConditionMap[$meta->orgtable][0],
'transform_key' => $meta->orgname
);