Completed
Pull Request — master (#1795)
by Christian
09:22
created
drupal/sites/default/boinc/modules/boincuser/boincuser.admin.inc 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -157,13 +157,11 @@  discard block
 block discarded – undo
157 157
   if (!$values['boinc_root_dir']) {
158 158
     form_set_error('boinc_root_dir', t('BOINC project root directory must be
159 159
       defined!'));
160
-  }
161
-  elseif (!is_dir($values['boinc_root_dir'])) {
160
+  } elseif (!is_dir($values['boinc_root_dir'])) {
162 161
     form_set_error('boinc_root_dir', t('BOINC project root not found at %directory',
163 162
       array('%directory' => $values['boinc_root_dir'])
164 163
     ));
165
-  }
166
-  else {
164
+  } else {
167 165
     // By default, try to automatically set specific directories from the root
168 166
     if (!$values['boinc_config_xml_dir']) {
169 167
       $values['boinc_config_xml_dir'] = $values['boinc_root_dir'];
@@ -285,8 +283,7 @@  discard block
 block discarded – undo
285 283
   if (!$values['boinc_scheduler_urls']) {
286 284
     form_set_error('boinc_scheduler_urls', t('At least one scheduling server
287 285
       URL must be specified.'));
288
-  }
289
-  else {
286
+  } else {
290 287
     $urls = explode("\r\n", $values['boinc_scheduler_urls']);
291 288
     foreach ($urls as $key => $url) {
292 289
       if (!$url) {
Please login to merge, or discard this patch.
sites/all/features/global_search_solr/global_search_solr.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 == "apachesolr" && $api == "apachesolr_environments") {
9 9
     return array("version" => 1);
10
-  }
11
-  elseif ($module == "apachesolr_search" && $api == "apachesolr_search_defaults") {
10
+  } elseif ($module == "apachesolr_search" && $api == "apachesolr_search_defaults") {
12 11
     return array("version" => 3);
13
-  }
14
-  elseif ($module == "facetapi" && $api == "facetapi_defaults") {
12
+  } elseif ($module == "facetapi" && $api == "facetapi_defaults") {
15 13
     return array("version" => 1);
16 14
   }
17 15
 }
Please login to merge, or discard this patch.
drupal/sites/all/features/boinc_standard/boinc_standard.features.inc 1 patch
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -7,17 +7,13 @@
 block discarded – undo
7 7
   list($module, $api) = func_get_args();
8 8
   if ($module == "input_formats" && $api == "input_formats") {
9 9
     return array("version" => 1);
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 == "panels_mini" && $api == "panels_default") {
12
+  } elseif ($module == "panels_mini" && $api == "panels_default") {
15 13
     return array("version" => 1);
16
-  }
17
-  elseif ($module == "strongarm" && $api == "strongarm") {
14
+  } elseif ($module == "strongarm" && $api == "strongarm") {
18 15
     return array("version" => 1);
19
-  }
20
-  elseif ($module == "wysiwyg" && $api == "wysiwyg") {
16
+  } elseif ($module == "wysiwyg" && $api == "wysiwyg") {
21 17
     return array("version" => 2);
22 18
   }
23 19
 }
Please login to merge, or discard this patch.
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.