Use mustBeQueued() to determine unqueueing in objectManager

include/objectManager.php

@@ -308,7 +308,7 @@ class ObjectManager
                     if($this->bIsRejected)
                         $oObject->ReQueue();
 
-                    if($this->bIsQueue)
+                    if($this->bIsQueue && !$oObject->mustBeQueued())
                         $oObject->unQueue();
 
                     $oObject->update();

include/testData_queue.php

@@ -97,6 +97,11 @@ class testData_queue
         return $this->oTestData->canEdit();
     }
 
+    function mustBeQueued()
+    {
+        return $this->oTestData->mustBeQueued();
+    }
+
     function objectDisplayAddItemHelp()
     {
         $this->oTestData->objectDisplayAddItemHelp();

include/vendor.php

@@ -217,6 +217,14 @@ class Vendor {
             return FALSE;
     }
 
+    function mustBeQueued()
+    {
+        if($_SESSION['current']->hasPriv("admin"))
+            return FALSE;
+        else
+            return TRUE;
+    }
+
     function getOutputEditorValues($aClean)
     {
         $this->sName = $aClean['sVendorName'];

include/version_queue.php

@@ -119,6 +119,11 @@ class version_queue
         return $this->oVersion->canEdit();
     }
 
+    function mustBeQueued()
+    {
+        return $this->oVersion->mustBeQueued();
+    }
+
     function objectDisplayAddItemHelp()
     {
         /* $this->oVersion->displayAddItemHelp(); */

unit_test/test_om_objects.php

@@ -131,6 +131,7 @@ function test_object_methods()
                           "objectMakeLink",
                           "objectMakeUrl",
                           "outputEditor",
+                          "mustBeQueued"
                          );
 
     $aTestClasses = array("application",