Merge branch 'QA_4_5'
This commit is contained in:
commit
00482376a3
@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog
|
||||
+ issue #11456 Disabled storage engines
|
||||
|
||||
4.5.1.0 (not yet released)
|
||||
- issue Invalid argument supplied for foreach()
|
||||
|
||||
4.5.0.0 (not yet released)
|
||||
+ rfe Pagination for GIS visualization
|
||||
|
||||
@ -285,6 +285,9 @@ function PMA_allowDeny($type)
|
||||
|
||||
// copy rule database
|
||||
$rules = $cfg['Server']['AllowDeny']['rules'];
|
||||
if (! is_array($rules)) {
|
||||
$rules = array();
|
||||
}
|
||||
|
||||
// lookup table for some name shortcuts
|
||||
$shortcuts = array(
|
||||
|
||||
Loading…
Reference in New Issue
Block a user