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

Merge branch 'QA_4_3'

Browse Source 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
This commit is contained in:
Madhura Jayaratne 2015-02-23 11:59:37 +05:30
commit 6642772f43
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -62,6 +62,7 @@ phpMyAdmin - ChangeLog
4.3.11.0 (not yet released)
- bug #4774 SQL links are completely wrong
- bug #4768 MariaDB: version mismatch
- bug #4777 Some images are missing in Designer for original theme
4.3.10.0 (2015-02-20)
- bug Undefined index navwork

20
libraries/db_designer.lib.php
View File

@ -706,32 +706,32 @@ function PMA_getDatabaseTables(
if (isset($tables_pk_or_unique_keys[$t_n . "." . $tab_column[$t_n]["COLUMN_NAME"][$j]])) {
$html .= '<img src="' . $_SESSION['PMA_Theme']->getImgPath()
. 'pmd/FieldKey_small.png" alt="*" />';
$html .= '<img src="'
. $_SESSION['PMA_Theme']->getImgPath('pmd/FieldKey_small.png')
. '" alt="*" />';
} else {
$html .= '<img src="' . $_SESSION['PMA_Theme']->getImgPath()
. 'pmd/Field_small';
$image = 'pmd/Field_small';
if (strstr($tab_column[$t_n]["TYPE"][$j], 'char')
|| strstr($tab_column[$t_n]["TYPE"][$j], 'text')
) {
$html .= '_char';
$image .= '_char';
} elseif (strstr($tab_column[$t_n]["TYPE"][$j], 'int')
|| strstr($tab_column[$t_n]["TYPE"][$j], 'float')
|| strstr($tab_column[$t_n]["TYPE"][$j], 'double')
|| strstr($tab_column[$t_n]["TYPE"][$j], 'decimal')
) {
$html .= '_int';
$image .= '_int';
} elseif (strstr($tab_column[$t_n]["TYPE"][$j], 'date')
|| strstr($tab_column[$t_n]["TYPE"][$j], 'time')
|| strstr($tab_column[$t_n]["TYPE"][$j], 'year')
) {
$html .= '_date';
$image .= '_date';
}
$image .= '.png';
$html .= '.png" alt="*" />';
$html .= '<img src="'
. $_SESSION['PMA_Theme']->getImgPath($image) . '" alt="*" />';
}
$html .= htmlspecialchars(