From b567c18f71d1202348ce54c4296c2bc5eb7fd601 Mon Sep 17 00:00:00 2001 From: Thomas Cresson Date: Mon, 26 Aug 2013 14:53:18 +0200 Subject: [PATCH] Notification problems with ftp fixed --- core/src/plugins/access.ftp/class.ftpAccessDriver.php | 2 +- .../plugins/uploader.html/class.SimpleUploadProcessor.php | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/src/plugins/access.ftp/class.ftpAccessDriver.php b/core/src/plugins/access.ftp/class.ftpAccessDriver.php index 9573949105..3cd2b1e157 100644 --- a/core/src/plugins/access.ftp/class.ftpAccessDriver.php +++ b/core/src/plugins/access.ftp/class.ftpAccessDriver.php @@ -199,7 +199,7 @@ function uploadActions($action, $httpVars, $filesVars){ return array("ERROR" => array("CODE" => $errorCode, "MESSAGE" => $errorMessage)); }else{ AJXP_Logger::debug("Return success"); - return array("SUCCESS" => true); + return array("SUCCESS" => true, "PREVENT_NOTIF" => true); } break; diff --git a/core/src/plugins/uploader.html/class.SimpleUploadProcessor.php b/core/src/plugins/uploader.html/class.SimpleUploadProcessor.php index ad7d0e052d..a05cca0621 100644 --- a/core/src/plugins/uploader.html/class.SimpleUploadProcessor.php +++ b/core/src/plugins/uploader.html/class.SimpleUploadProcessor.php @@ -106,8 +106,10 @@ public function postProcess($action, $httpVars, $postProcessData){ } AJXP_XMLWriter::close(); /* for further implementation */ - if(!isset($httpVars["prevent_notification"])){ - AJXP_Controller::applyHook("node.change", array(null, $result["CREATED_NODE"], false)); + if(!$result["PREVENT_NOTIF"]){ + if(isset($result["CREATED_NODE"])){ + AJXP_Controller::applyHook("node.change", array(null, $result["CREATED_NODE"], false)); + } } //exit("OK"); }