Commit b859202b authored by Till Brehm's avatar Till Brehm

Merge branch 'patch-3' into 'stable-3.1'

Fixed: aps installer bugs when using php7

Change string variables to array because they are treated as arrays later

See merge request !593
parents a2d22c42 f25a6b74
...@@ -846,7 +846,7 @@ class ApsGUIController extends ApsBase ...@@ -846,7 +846,7 @@ class ApsGUIController extends ApsBase
$pkg['Requirements PHP extensions'] = trim($php_ext); $pkg['Requirements PHP extensions'] = trim($php_ext);
// PHP bool options // PHP bool options
$pkg['Requirements PHP settings'] = ''; $pkg['Requirements PHP settings'] = array();
$php_bool_options = array('allow-url-fopen', 'file-uploads', 'magic-quotes-gpc', $php_bool_options = array('allow-url-fopen', 'file-uploads', 'magic-quotes-gpc',
'register-globals', 'safe-mode', 'short-open-tag'); 'register-globals', 'safe-mode', 'short-open-tag');
foreach($php_bool_options as $option) foreach($php_bool_options as $option)
......
...@@ -113,7 +113,7 @@ $records = $app->db->queryAllRecords($query); ...@@ -113,7 +113,7 @@ $records = $app->db->queryAllRecords($query);
$app->listform_actions->DataRowColor = '#FFFFFF'; $app->listform_actions->DataRowColor = '#FFFFFF';
// Re-form all result entries and add extra entries // Re-form all result entries and add extra entries
$records_new = ''; $records_new = array();
if(is_array($records)) if(is_array($records))
{ {
$app->listform_actions->idx_key = $app->listform->listDef["table_idx"]; $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