Skip to content

Commit

Permalink
Catch correct exception and pass $collection to error handler.
Browse files Browse the repository at this point in the history
  • Loading branch information
mrubinsk committed Apr 27, 2016
1 parent 796120c commit 4e719e5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
}
Expand Down

0 comments on commit 4e719e5

Please sign in to comment.