From 4e719e5d6b1af092744bea87d33626eff7055951 Mon Sep 17 00:00:00 2001 From: Michael J Rubinsky Date: Tue, 26 Apr 2016 23:29:51 -0400 Subject: [PATCH] Catch correct exception and pass $collection to error handler. --- framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php index dfc1debb335..13b0d011a5a 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php @@ -931,7 +931,7 @@ protected function _parseSyncCommands(&$collection) $this->_statusCode = self::STATUS_SERVERERROR; $this->_handleGlobalSyncError(); return false; - } catch (Horde_ActiveSync_Exception $e) { + } catch (Horde_ActiveSync_Exception_FolderGone $e) { $this->_statusCode = self::STATUS_FOLDERSYNC_REQUIRED; $this->_handleError($collection); return false; @@ -1208,7 +1208,7 @@ public function _parseSyncOptions(&$collection) $options['conflict'] = $this->_decoder->getElementContent(); if (!$this->_decoder->getElementEndTag()) { $this->_statusCode = self::STATUS_PROTERROR; - $this->_handleError; + $this->_handleError($collection); exit; } }