Skip to content

Commit b859202

Browse files
author
Till Brehm
committed
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
2 parents a2d22c4 + f25a6b7 commit b859202

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

interface/lib/classes/aps_guicontroller.inc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,7 @@ public function getPackageDetails($id)
846846
$pkg['Requirements PHP extensions'] = trim($php_ext);
847847

848848
// PHP bool options
849-
$pkg['Requirements PHP settings'] = '';
849+
$pkg['Requirements PHP settings'] = array();
850850
$php_bool_options = array('allow-url-fopen', 'file-uploads', 'magic-quotes-gpc',
851851
'register-globals', 'safe-mode', 'short-open-tag');
852852
foreach($php_bool_options as $option)

interface/web/sites/aps_installedpackages_list.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
$app->listform_actions->DataRowColor = '#FFFFFF';
114114

115115
// Re-form all result entries and add extra entries
116-
$records_new = '';
116+
$records_new = array();
117117
if(is_array($records))
118118
{
119119
$app->listform_actions->idx_key = $app->listform->listDef["table_idx"];

0 commit comments

Comments
 (0)