Fix parview formatting issues and declaration of $flag variable.

philltran · Nov 1, 2014 · fe4a5ed · fe4a5ed
1 parent 4337696
commit fe4a5ed
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/message_private.install b/message_private.install
@@ -386,7 +386,7 @@ function message_private_update_7100() {
   // Uninstall Flag data and delete flag.
   $flag = flag_get_flag('private_message_notify');
   // If the flag does not exist then NULL is returned.
-  if($flag) {
+  if ($flag) {
     // If the flag exist then reset and delete the flag.
     flag_reset_flag($flag);
     $flag->delete();
@@ -421,7 +421,7 @@ function message_private_update_7100() {
     'type' => 'list_boolean',
   );
 
-  if(!field_create_field($field_base)) {
+  if (!field_create_field($field_base)) {
     throw new DrupalUpdateException('Could not create "field_private_message_notify" field base.');
   }
 
@@ -461,9 +461,9 @@ function message_private_update_7100() {
     ),
   );
 
-  if(!field_create_instance($field_instance)) {
+  if (!field_create_instance($field_instance)) {
     throw new DrupalUpdateException('Could not create "field_private_message_notify" field instance.');
   }
 
   return t('Updates were successful.');
-}
+}
diff --git a/message_private.module b/message_private.module
@@ -381,7 +381,7 @@ function message_private_entity_insert($entity, $type) {
     if (is_array($users)) {
       foreach ($users as $user) {
         $notify = field_get_items('user', $user, 'field_private_message_notify');
-        if(!empty($notify) && is_array($notify)) {
+        if (!empty($notify) && is_array($notify)) {
           // Get the 1st value of the array as there is only 1 possible item.
           $notify = array_shift($notify);
         }

diff --git a/message_private_og/message_private_og.module b/message_private_og/message_private_og.module
@@ -302,7 +302,6 @@ function message_private_og_message_insert($message) {
     $wrapper = entity_metadata_wrapper('message', $message);
 
     $mail = array();
-    $flag = flag_get_flag('private_message_notify');
     $groups = $wrapper->field_message_groups_ref->value();
 
     if (!empty($groups) && is_array($groups)) {
@@ -312,7 +311,7 @@ function message_private_og_message_insert($message) {
         $users = user_load_multiple($uids);
         foreach ($users as $user) {
           $notify = field_get_items('user', $user, 'field_private_message_notify');
-          if(!empty($notify) && is_array($notify)) {
+          if (!empty($notify) && is_array($notify)) {
             // Get the 1st value of the array as there is only 1 possible item.
             $notify = array_shift($notify);
           }