Skip to content

Commit

Permalink
Fix fatal crash on sending back incoming sync conflict status. Bug #1…
Browse files Browse the repository at this point in the history
…2755

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 <mrubinsk@horde.org>
  • Loading branch information
thomasjfox authored and mrubinsk committed Oct 11, 2013
1 parent df3d771 commit f9c4b50
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php
Expand Up @@ -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);
Expand Down

0 comments on commit f9c4b50

Please sign in to comment.