extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-26 07:49:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

* PHP7/ImportExport: fix different evaluation order of PHP 5 and 7 gives eg. error "Function name must be string" in wizard

Browse Source
This commit is contained in:
Ralf Becker 2016-07-07 20:25:32 +02:00
parent a75c425f57
commit 0b64ced1d1
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/Mail.php
View File

@ -3391,7 +3391,7 @@ class Mail
//highest precedence //highest precedence
try try
{ {
$_folderName = $this->icServer->$types[$_type]['profileKey']; $_folderName = $this->icServer->{$types[$_type]['profileKey']};
} }
catch (\Exception $e) catch (\Exception $e)
{ {

2
calendar/inc/class.calendar_export_csv.inc.php
View File

@ -103,7 +103,7 @@ class calendar_export_csv implements importexport_iface_export_plugin {
if(method_exists($ui, $states['view'])) if(method_exists($ui, $states['view']))
{ {
ob_start(); ob_start();
$ui->$states['view'](); $ui->{$states['view']}();
ob_end_clean(); ob_end_clean();
} }
$query += array( $query += array(

2
calendar/inc/class.calendar_export_ical.inc.php
View File

@ -95,7 +95,7 @@ class calendar_export_ical extends calendar_export_csv {
if(method_exists($ui, $states['view'])) if(method_exists($ui, $states['view']))
{ {
ob_start(); ob_start();
$ui->$states['view'](); $ui->{$states['view']}();
ob_end_clean(); ob_end_clean();
} }
$query += array( $query += array(

8
importexport/inc/class.importexport_definitions_ui.inc.php
View File

@ -544,11 +544,11 @@ class importexport_definitions_ui
} }
if(!key_exists($content['step'],$this->steps)) if(!key_exists($content['step'],$this->steps))
{ {
$next_step = $this->plugin->$content['step']($content,$sel_options,$readonlys,$preserv); $next_step = $this->plugin->{$content['step']}($content,$sel_options,$readonlys,$preserv);
} }
else else
{ {
$next_step = $this->$content['step']($content,$sel_options,$readonlys,$preserv); $next_step = $this->{$content['step']}($content,$sel_options,$readonlys,$preserv);
} }
} }
else else
@ -578,11 +578,11 @@ class importexport_definitions_ui
{ {
if(!key_exists($content['step'],$this->steps)) if(!key_exists($content['step'],$this->steps))
{ {
$next_step = $this->plugin->$content['step']($content); $next_step = $this->plugin->{$content['step']}($content);
} }
else else
{ {
$next_step = $this->$content['step']($content); $next_step = $this->{$content['step']}($content);
} }
} }
} while($this->wizard_content_template == self::SKIP); } while($this->wizard_content_template == self::SKIP);

4
resources/inc/class.resources_import_csv.inc.php
View File

@ -113,9 +113,9 @@ class resources_import_csv extends importexport_basic_import_csv {
switch ( $condition['type'] ) { switch ( $condition['type'] ) {
// exists // exists
case 'exists' : case 'exists' :
if($record->$condition['string']) { if($record->{$condition['string']}) {
$results = $this->bo->so->search( $results = $this->bo->so->search(
array( $condition['string'] => $record->$condition['string']), array( $condition['string'] => $record->{$condition['string']}),
False False
); );
} }