From 8d82dd1f9893b3830c4c664898271c66b850e0b5 Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Thu, 22 Apr 2010 10:25:24 -0400 Subject: [PATCH] fix typo --- framework/ActiveSync/lib/Horde/ActiveSync/State/File.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/State/File.php b/framework/ActiveSync/lib/Horde/ActiveSync/State/File.php index 2d7f92346..5ca258b12 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/State/File.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/State/File.php @@ -154,7 +154,7 @@ class Horde_ActiveSync_State_File extends Horde_ActiveSync_State_Base return false; } - if ($state['mod'] != $oldstat['mod']) { + if ($stat['mod'] != $oldstat['mod']) { // Changed here if ($type == 'delete' || $type == 'change') { // changed here, but deleted there -> conflict, -- 2.11.0