Commit f7b912de authored by Marius Burkard's avatar Marius Burkard

Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1

parents e958729d b859202b
......@@ -846,7 +846,7 @@ class ApsGUIController extends ApsBase
$pkg['Requirements PHP extensions'] = trim($php_ext);
// PHP bool options
$pkg['Requirements PHP settings'] = '';
$pkg['Requirements PHP settings'] = array();
$php_bool_options = array('allow-url-fopen', 'file-uploads', 'magic-quotes-gpc',
'register-globals', 'safe-mode', 'short-open-tag');
foreach($php_bool_options as $option)
......
......@@ -113,7 +113,7 @@ $records = $app->db->queryAllRecords($query);
$app->listform_actions->DataRowColor = '#FFFFFF';
// Re-form all result entries and add extra entries
$records_new = '';
$records_new = array();
if(is_array($records))
{
$app->listform_actions->idx_key = $app->listform->listDef["table_idx"];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment