From cc45df9928c3cb97571b61a0a4977bf09c33f00b Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Wed, 8 Sep 2010 16:24:47 +0000 Subject: [PATCH] Backport 31972 - Remove call to missing function - doesn't look needed, it works without. --- importexport/inc/class.importexport_definitions_ui.inc.php | 2 +- importexport/inc/class.importexport_helper_functions.inc.php | 2 +- importexport/inc/class.importexport_import_ui.inc.php | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/importexport/inc/class.importexport_definitions_ui.inc.php b/importexport/inc/class.importexport_definitions_ui.inc.php index aa3b114456..7f4a662dfb 100644 --- a/importexport/inc/class.importexport_definitions_ui.inc.php +++ b/importexport/inc/class.importexport_definitions_ui.inc.php @@ -259,7 +259,7 @@ class importexport_definitions_ui else { $GLOBALS['egw']->js->set_onload("document.getElementById('picturebox').style.display = 'none';"); - egw_framework::validate_file('.', 'etemplate', 'etemplate'); + $GLOBALS['egw']->js->validate_file('.', 'etemplate', 'etemplate'); $GLOBALS['egw']->common->egw_header(); echo '
'."\n"; echo '

{Im|Ex}port Wizard

'; diff --git a/importexport/inc/class.importexport_helper_functions.inc.php b/importexport/inc/class.importexport_helper_functions.inc.php index b4a90826b1..84652ed00b 100755 --- a/importexport/inc/class.importexport_helper_functions.inc.php +++ b/importexport/inc/class.importexport_helper_functions.inc.php @@ -333,7 +333,7 @@ class importexport_helper_functions { } $d->close(); } - //error_log(__CLASS__.__FUNCTION__.print_r($plugins,true)); + error_log(__CLASS__.__FUNCTION__.print_r($plugins,true)); return $plugins; } diff --git a/importexport/inc/class.importexport_import_ui.inc.php b/importexport/inc/class.importexport_import_ui.inc.php index 70dda8dd88..92018c529c 100644 --- a/importexport/inc/class.importexport_import_ui.inc.php +++ b/importexport/inc/class.importexport_import_ui.inc.php @@ -32,7 +32,6 @@ private $plugins; public function __construct() { - $GLOBALS['egw']->js->validate_file('.','import_dialog','importexport'); $this->plugins = importexport_helper_functions::get_plugins('all','import'); $GLOBALS['egw_info']['flags']['include_xajax'] = true; } @@ -127,7 +126,6 @@ } } $response = new xajaxResponse(); - $response->addScript('import_dialog.change_definition(document.getElementId(\'exec[definition]\'));'); $response->addAssign('exec[definition]','innerHTML',$sel_options['definition']); return $response->getXML(); }