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

Fix merge conflict

Browse Source 
Signed-off-by: Marc Delisle <marc@infomarc.info>
This commit is contained in:
Marc Delisle 2015-09-05 05:57:33 -04:00
commit cd34ffab02
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -110,6 +110,7 @@ phpMyAdmin - ChangeLog
- issue #11451 Designer-Bug in move.js on multiple server configuration
- issue #11458 Invalid UTF-8 sequence in argument
- issue #11457 Request URI too large
- issue Invalid argument supplied for foreach()
4.4.14.0 (2015-08-20)
- issue #11367 Export after search, missing WHERE clause

32
templates/table/relation/common_form.phtml
View File

@ -50,20 +50,22 @@
</th>
</tr>
<?php $odd_row = true; $i = 0; ?>
<?php foreach ($existrel_foreign as $key => $one_key): ?>
<?php echo PMA\Template::get('table/relation/foreign_key_row')->render(
array(
'one_key' => $one_key,
'odd_row' => $odd_row,
'columns' => $columns,
'i' => $i++,
'options_array' => $options_array,
'tbl_storage_engine' => $tbl_storage_engine,
'db' => $db
)
);
$odd_row = ! $odd_row;?>
<?php endforeach; ?>
<?php if (! empty($existrel_foreign)): ?>
<?php foreach ($existrel_foreign as $key => $one_key): ?>
<?php echo PMA\Template::get('table/relation/foreign_key_row')->render(
array(
'one_key' => $one_key,
'odd_row' => $odd_row,
'columns' => $columns,
'i' => $i++,
'options_array' => $options_array,
'tbl_storage_engine' => $tbl_storage_engine,
'db' => $db
)
);
$odd_row = ! $odd_row;?>
<?php endforeach; ?>
<?php endif; ?>
<?php echo PMA\Template::get('table/relation/foreign_key_row')->render(
array(
'one_key' => array(),
@ -106,4 +108,4 @@
<input type="button" class="preview_sql" value="<?php echo __('Preview SQL'); ?>" />
<input type="submit" value="<?php echo __('Save'); ?>" />
</fieldset>
</form>
</form>