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-12-13 22:40:08 +01:00
parent e0db3a7d13 5d915f1ff6
commit 42c12da9fb
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -136,6 +136,7 @@
thanks to Craig Duncan - duncan3dc thanks to Craig Duncan - duncan3dc
- bug #3112614 [pdf schema] Scratchboard for PDF pages not working - bug #3112614 [pdf schema] Scratchboard for PDF pages not working
- bug #3125606 [parser] Query for table "level" causes strange display - bug #3125606 [parser] Query for table "level" causes strange display
- bug #3127904 [parser] Close all opened round brackets indents
3.3.8.1 (2010-11-29) 3.3.8.1 (2010-11-29)
- bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8 - bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8

33
libraries/sqlparser.lib.php
View File

@@ -2197,7 +2197,6 @@ if (! defined('PMA_MINIMUM_COMMON')) {
// DEBUG echo "Loop format <strong>" . $arr[$i]['data'] . "</strong> " . $arr[$i]['type'] . "<br />"; // DEBUG echo "Loop format <strong>" . $arr[$i]['data'] . "</strong> " . $arr[$i]['type'] . "<br />";
$before = ''; $before = '';
$after = ''; $after = '';
$indent = 0;
// array_shift($typearr); // array_shift($typearr);
/* /*
0 prev2 0 prev2
@@ -2297,17 +2296,20 @@ if (! defined('PMA_MINIMUM_COMMON')) {
} }
break; break;
case 'punct_bracket_close_round': case 'punct_bracket_close_round':
$bracketlevel--; // only close bracket level when it was opened before
if ($infunction == TRUE) { if ($bracketlevel > 0) {
$functionlevel--; $bracketlevel--;
$after .= ' '; if ($infunction == TRUE) {
$before .= ' '; $functionlevel--;
} else { $after .= ' ';
$indent--; $before .= ' ';
$before .= ($mode != 'query_only' ? '</div>' : ' '); } else {
} $indent--;
$infunction = ($functionlevel > 0) ? TRUE : FALSE; $before .= ($mode != 'query_only' ? '</div>' : ' ');
break; }
$infunction = ($functionlevel > 0) ? TRUE : FALSE;
}
break;
case 'alpha_columnType': case 'alpha_columnType':
if ($docu) { if ($docu) {
switch ($arr[$i]['data']) { switch ($arr[$i]['data']) {
@@ -2610,7 +2612,12 @@ if (! defined('PMA_MINIMUM_COMMON')) {
} }
$str .= $after; $str .= $after;
} // end for } // end for
/* End possibly unclosed documentation link */ // close unclosed indent levels
while ($indent > 0) {
$indent--;
$str .= ($mode != 'query_only' ? '</div>' : ' ');
}
/* End possibly unclosed documentation link */
if ($close_docu_link) { if ($close_docu_link) {
$str .= '</a>'; $str .= '</a>';
$close_docu_link = false; $close_docu_link = false;