Completed
Pull Request — master (#2190)
by Christian
14:01
created
drupal/sites/all/features/news/news.features.inc 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -7,8 +7,7 @@
 block discarded – undo
7 7
   list($module, $api) = func_get_args();
8 8
   if ($module == "context" && $api == "context") {
9 9
     return array("version" => 3);
10
-  }
11
-  elseif ($module == "strongarm" && $api == "strongarm") {
10
+  } elseif ($module == "strongarm" && $api == "strongarm") {
12 11
     return array("version" => 1);
13 12
   }
14 13
 }
Please login to merge, or discard this patch.
drupal/sites/all/features/discussion_forums/discussion_forums.module 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -26,8 +26,7 @@  discard block
 block discarded – undo
26 26
   
27 27
   if (isset($roles[$rid]) AND $roles[$rid] == $better_name) {
28 28
     // Life is good
29
-  }
30
-  else {
29
+  } else {
31 30
     $better_rid = array_search($better_name, $roles);
32 31
     $old_rid = array_search('Forum Moderator', $roles);
33 32
     if (!$better_rid) {
@@ -36,8 +35,7 @@  discard block
 block discarded – undo
36 35
           $better_name, $old_rid);
37 36
         $better_rid = $old_rid;
38 37
         $old_rid = NULL;
39
-      }
40
-      else {
38
+      } else {
41 39
         drupal_set_message(t('The Forum Access module is not set up right. Try disabling the Discussion Forums feature and then manually uninstall the Forum Access module before enabling Discussion Forums again.', 'error'));
42 40
       }
43 41
     }
Please login to merge, or discard this patch.
drupal/sites/all/features/team_forums/team_forums.features.inc 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -7,11 +7,9 @@
 block discarded – undo
7 7
   list($module, $api) = func_get_args();
8 8
   if ($module == "context" && $api == "context") {
9 9
     return array("version" => 3);
10
-  }
11
-  elseif ($module == "page_manager" && $api == "pages_default") {
10
+  } elseif ($module == "page_manager" && $api == "pages_default") {
12 11
     return array("version" => 1);
13
-  }
14
-  elseif ($module == "strongarm" && $api == "strongarm") {
12
+  } elseif ($module == "strongarm" && $api == "strongarm") {
15 13
     return array("version" => 1);
16 14
   }
17 15
 }
Please login to merge, or discard this patch.
drupal/sites/all/features/teams/teams.features.inc 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -7,8 +7,7 @@
 block discarded – undo
7 7
   list($module, $api) = func_get_args();
8 8
   if ($module == "page_manager" && $api == "pages_default") {
9 9
     return array("version" => 1);
10
-  }
11
-  elseif ($module == "strongarm" && $api == "strongarm") {
10
+  } elseif ($module == "strongarm" && $api == "strongarm") {
12 11
     return array("version" => 1);
13 12
   }
14 13
 }
Please login to merge, or discard this patch.
drupal/sites/all/features/user_profiles/user_profiles.features.inc 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -7,11 +7,9 @@
 block discarded – undo
7 7
   list($module, $api) = func_get_args();
8 8
   if ($module == "context" && $api == "context") {
9 9
     return array("version" => 3);
10
-  }
11
-  elseif ($module == "panels_mini" && $api == "panels_default") {
10
+  } elseif ($module == "panels_mini" && $api == "panels_default") {
12 11
     return array("version" => 1);
13
-  }
14
-  elseif ($module == "strongarm" && $api == "strongarm") {
12
+  } elseif ($module == "strongarm" && $api == "strongarm") {
15 13
     return array("version" => 1);
16 14
   }
17 15
 }
Please login to merge, or discard this patch.
drupal/sites/all/themes/zen/zen-internals/template.conditional-styles.inc 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -94,13 +94,11 @@
 block discarded – undo
94 94
         if (db_is_active()) {
95 95
           variable_set('conditional_styles_' . $theme, $conditional_styles);
96 96
           variable_set('conditional_styles_' . $theme . '_rtl', $conditional_styles_rtl);
97
-        }
98
-        else {
97
+        } else {
99 98
           $GLOBALS['conf']['conditional_styles_' . $theme] = $conditional_styles;
100 99
           $GLOBALS['conf']['conditional_styles_' . $theme . '_rtl'] = $conditional_styles_rtl;
101 100
         }
102
-      }
103
-      elseif (db_is_active()) {
101
+      } elseif (db_is_active()) {
104 102
         variable_del('conditional_styles_' . $theme);
105 103
         variable_del('conditional_styles_' . $theme . '_rtl');
106 104
       }
Please login to merge, or discard this patch.
drupal/sites/all/themes/zen/zen-internals/template.theme-registry.inc 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -122,8 +122,7 @@
 block discarded – undo
122 122
     // Save the settings back to the database.
123 123
     if (db_is_active()) {
124 124
       variable_set('theme_'. $theme .'_settings', $settings);
125
-    }
126
-    else {
125
+    } else {
127 126
       $GLOBALS['conf']['theme_'. $theme .'_settings'] = $settings;
128 127
     }
129 128
     // If the active theme has been loaded, force refresh of Drupal internals.
Please login to merge, or discard this patch.
drupal/sites/all/themes/zen/zen-internals/template.zen.inc 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -19,8 +19,7 @@
 block discarded – undo
19 19
   // Add default styles.
20 20
   if (theme_get_setting('zen_layout') == 'zen-columns-fixed') {
21 21
     drupal_add_css($directory . '/zen-fixed.css', 'theme', 'all');
22
-  }
23
-  else {
22
+  } else {
24 23
     drupal_add_css($directory . '/zen-liquid.css', 'theme', 'all');
25 24
   }
26 25
   // Add print styles.
Please login to merge, or discard this patch.
drupal/sites/all/themes/zen/zen-internals/template.comment.inc 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -29,8 +29,7 @@  discard block
 block discarded – undo
29 29
   if ($vars['comment']->status == COMMENT_NOT_PUBLISHED) {
30 30
     $vars['unpublished'] = TRUE;
31 31
     $vars['classes_array'][] = $vars['status'];
32
-  }
33
-  else {
32
+  } else {
34 33
     $vars['unpublished'] = FALSE;
35 34
   }
36 35
   // Zebra striping.
@@ -44,8 +43,7 @@  discard block
 block discarded – undo
44 43
   if ($vars['comment']->uid == 0) {
45 44
     // Comment is by an anonymous user.
46 45
     $vars['classes_array'][] = 'comment-by-anonymous';
47
-  }
48
-  else {
46
+  } else {
49 47
     if ($vars['comment']->uid == $vars['node']->uid) {
50 48
       // Comment is by the node author.
51 49
       $vars['classes_array'][] = 'comment-by-node-author';
Please login to merge, or discard this patch.