From f9c4b502d2dc49480c59d594bb2b3d153bcaa724 Mon Sep 17 00:00:00 2001 From: Thomas Jarosch Date: Fri, 11 Oct 2013 12:46:46 +0200 Subject: [PATCH] Fix fatal crash on sending back incoming sync conflict status. Bug #12755 Two PHP error message get fixed: PHP Fatal error: Undefined class constant 'SYNC_CHANGE' in /usr/share/pear/Horde/ActiveSync/Request/Sync.php on line 516 PHP Fatal error: Call to a member function content() on a non-object in /usr/share/pear/Horde/ActiveSync/Request/Sync.php on line 518 Signed-off-by: Michael J Rubinsky --- framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php index 939706ecca9..be00a272844 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php @@ -507,12 +507,12 @@ protected function _handle() } } - // Output any SYNC_CHANGE failures + // Output any SYNC_MODIFY failures if (!empty($collection['importfailures'])) { foreach ($collection['importfailures'] as $id => $reason) { - $this->_encoder->startTag(Horde_ActiveSync::SYNC_CHANGE); + $this->_encoder->startTag(Horde_ActiveSync::SYNC_MODIFY); $this->_encoder->startTag(Horde_ActiveSync::SYNC_SERVERENTRYID); - $tihs->_encoder->content($id); + $this->_encoder->content($id); $this->_encoder->endTag(); $this->_encoder->startTag(Horde_ActiveSync::SYNC_STATUS); $this->_encoder->content($reason);