extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 16:03:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Import/Export: Avoid "Undefined variable: filter" error"

Browse Source 
This reverts commit d57df627

(cherry picked from commit c853bb0f84)
This commit is contained in:
nathangray 2021-06-10 09:44:13 -06:00
parent 1586bbd66a
commit 5ec39458af
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
importexport/inc/class.importexport_definition.inc.php
View File

@ -93,12 +93,9 @@ class importexport_definition implements importexport_iface_egw_record {
{ {
$options_data = importexport_arrayxml::xml2array( $this->definition['plugin_options'] ); $options_data = importexport_arrayxml::xml2array( $this->definition['plugin_options'] );
$this->definition['plugin_options'] = (array)$options_data['root']; $this->definition['plugin_options'] = (array)$options_data['root'];
if($this->definition['filter']) if($this->definition['filter']) $filter = importexport_arrayxml::xml2array( $this->definition['filter'] );
{
$filter = importexport_arrayxml::xml2array( $this->definition['filter'] );
$this->definition['filter'] = $filter['root']; $this->definition['filter'] = $filter['root'];
} }
}
catch (Throwable $e) catch (Throwable $e)
{ {
error_log(__METHOD__ . " Error constructing definition " . error_log(__METHOD__ . " Error constructing definition " .