Merge branch 'QA_4_6'

Conflicts:
	po/da.po
	po/id.po
	po/ko.po
	po/pt_BR.po
This commit is contained in:
Deven Bansod 2016-11-08 11:09:57 +05:30
commit 36476c77a8

View File

@ -123,8 +123,7 @@ function PMA_getScriptContr()
);
while ($val = @$GLOBALS['dbi']->fetchRow($alltab_rs)) {
$row = PMA_getForeigners($GLOBALS['db'], $val[0], '', 'internal');
//echo "<br> internal ".$GLOBALS['db']." - ".$val[0]." - ";
//print_r($row);
if ($row !== false) {
foreach ($row as $field => $value) {
$con['C_NAME'][$i] = '';
@ -138,8 +137,7 @@ function PMA_getScriptContr()
}
}
$row = PMA_getForeigners($GLOBALS['db'], $val[0], '', 'foreign');
//echo "<br> INNO ";
//print_r($row);
if ($row !== false) {
foreach ($row['foreign_keys_data'] as $one_key) {
foreach ($one_key['index_list'] as $index => $one_field) {