cvs diff: Diffing .
Index: resource_conflict.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/resource_conflict/resource_conflict.module,v
retrieving revision 1.5
diff -u -p -r1.5 resource_conflict.module
--- resource_conflict.module	5 Aug 2009 16:01:53 -0000	1.5
+++ resource_conflict.module	27 Nov 2009 17:30:01 -0000
@@ -424,12 +424,11 @@ function _resource_conflict_disable($typ
   // alert the site administrator.
   if (variable_get('rc_type_' . $type, FALSE)) {
     variable_del('rc_type_'. $type);
-    $msg = t('Resource Conflict has been disabled for the %type content type as the requirements for it are no longer met.', array('%type' => $type));
     
     if ($display) {
-      drupal_set_message($msg, 'Resource Conflict');
+      drupal_set_message(t('Resource Conflict has been disabled for the %type content type as the requirements for it are no longer met.', array('%type' => $type)), 'Resource Conflict');
     }
-    watchdog('rsrc conflict', $msg, WATCHDOG_WARNING);
+    watchdog('rsrc conflict', 'Resource Conflict has been disabled for the %type content type as the requirements for it are no longer met.', array('%type' => $type), WATCHDOG_WARNING);
   }
 }