From 42fd118658dacc6b211f7326ea351807b1a6e6cf Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Mon, 6 Jul 2015 18:05:05 -0400
Subject: [PATCH] Comment out table level lock (it can cause dead locks in some
 edge cases)

---
 airtime_mvc/application/models/Preference.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php
index ec8b49a3c..736dbef98 100644
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@@ -31,7 +31,8 @@ class Application_Model_Preference
         $con->beginTransaction();
 
         try {
-            static::_lock($con);
+            /* Comment this out while we reevaluate it in favor of a unique constraint
+            static::_lock($con); */
             $userId = self::getUserId();
             
             if ($isUserValue && is_null($userId)) {