Completed
Pull Request — master (#1821)
by Christian
15:34 queued 05:15
created
sites/default/boinc/modules/contrib/views/modules/book.views_convert.inc 1 patch
Switch Indentation   +58 added lines, -58 removed lines patch added patch discarded remove patch
@@ -10,71 +10,71 @@
 block discarded – undo
10 10
  */
11 11
 function book_views_convert($display, $type, &$view, $field, $id = NULL) {
12 12
   switch ($type) {
13
-    case 'field':
14
-      switch ($field['tablename']) {
15
-        case 'book_parent_node':
16
-          switch ($field['field']) {
17
-            case 'title':
18
-              $item = $view->get_item($display, 'field', $id);
19
-              if ($field['handler'] == 'views_handler_field_book_parent_title') {
20
-                $item['link_to_node'] = TRUE;
21
-              }
22
-              $item['relationship'] = $view->add_item($display, 'relationship', 'book_parent', 'nid', array(), 'book_parent_nid');
23
-              $item['table'] = 'node';
24
-              $item['field'] = 'title';
25
-              $view->set_item($display, 'field', $id, $item);
26
-              break;
27
-          }
28
-          break;
13
+  case 'field':
14
+    switch ($field['tablename']) {
15
+    case 'book_parent_node':
16
+    switch ($field['field']) {
17
+    case 'title':
18
+    $item = $view->get_item($display, 'field', $id);
19
+    if ($field['handler'] == 'views_handler_field_book_parent_title') {
20
+    $item['link_to_node'] = TRUE;
21
+    }
22
+    $item['relationship'] = $view->add_item($display, 'relationship', 'book_parent', 'nid', array(), 'book_parent_nid');
23
+    $item['table'] = 'node';
24
+    $item['field'] = 'title';
25
+    $view->set_item($display, 'field', $id, $item);
26
+    break;
27
+    }
28
+        break;
29 29
       }
30 30
       break;
31
-    case 'filter':
32
-      switch ($field['tablename']) {
33
-        case 'book':
34
-          switch ($field['field']) {
35
-            case 'parent':
36
-              $operators = array('AND' => '=', 'OR' => '=', 'NOT' => '!=');
37
-              $item = $view->get_item($display, 'filter', $id);
38
-              $item['operator'] = $operators[$field['operator']];
39
-              $item['relationship'] = $view->add_item($display, 'relationship', 'book_parent', 'nid', array(), 'book_parent_nid');
40
-              $item['table'] = 'node';
41
-              $item['field'] = 'nid';
42
-              $view->set_item($display, 'filter', $id, $item);
43
-              break;
44
-          }
45
-          break;
31
+  case 'filter':
32
+    switch ($field['tablename']) {
33
+    case 'book':
34
+    switch ($field['field']) {
35
+    case 'parent':
36
+    $operators = array('AND' => '=', 'OR' => '=', 'NOT' => '!=');
37
+    $item = $view->get_item($display, 'filter', $id);
38
+    $item['operator'] = $operators[$field['operator']];
39
+    $item['relationship'] = $view->add_item($display, 'relationship', 'book_parent', 'nid', array(), 'book_parent_nid');
40
+    $item['table'] = 'node';
41
+    $item['field'] = 'nid';
42
+    $view->set_item($display, 'filter', $id, $item);
43
+    break;
44
+    }
45
+        break;
46 46
       }
47 47
       break;
48
-    case 'sort':
49
-      switch ($field['tablename']) {
50
-        case 'book':
51
-          switch ($field['field']) {
52
-            case 'weight':
53
-              $view->set_item_option($display, 'sort', $id, 'table', 'book_menu_links');
54
-              break;
55
-          }
56
-          break;
57
-        case 'book_parent_node':
58
-          switch ($field['field']) {
59
-            case 'title':
60
-              $item = $view->get_item($display, 'sort', $id);
61
-              $item['relationship'] = $view->add_item($display, 'relationship', 'book_parent', 'nid', array(), 'book_parent_nid');
62
-              $item['table'] = 'node';
63
-              $item['field'] = 'title';
64
-              $view->set_item($display, 'sort', $id, $item);
65
-              break;
66
-          }
67
-          break;
68
-      }
48
+  case 'sort':
49
+    switch ($field['tablename']) {
50
+    case 'book':
51
+    switch ($field['field']) {
52
+    case 'weight':
53
+    $view->set_item_option($display, 'sort', $id, 'table', 'book_menu_links');
54
+    break;
55
+    }
56
+        break;
57
+    case 'book_parent_node':
58
+      switch ($field['field']) {
59
+      case 'title':
60
+      $item = $view->get_item($display, 'sort', $id);
61
+      $item['relationship'] = $view->add_item($display, 'relationship', 'book_parent', 'nid', array(), 'book_parent_nid');
62
+      $item['table'] = 'node';
63
+      $item['field'] = 'title';
64
+      $view->set_item($display, 'sort', $id, $item);
69 65
       break;
70
-    case 'argument':
71
-      $options = $field['argoptions'];
72
-      switch ($field['type']) {
73
-        case 'book_parent':
74
-          $options['relationship'] = $view->add_item($display, 'relationship', 'book_parent', 'nid', array(), 'book_parent_nid');
75
-          $view->add_item($display, 'argument', 'node', 'nid', $options, $field['id']);
66
+      }
76 67
           break;
77 68
       }
78 69
       break;
70
+  case 'argument':
71
+    $options = $field['argoptions'];
72
+    switch ($field['type']) {
73
+    case 'book_parent':
74
+    $options['relationship'] = $view->add_item($display, 'relationship', 'book_parent', 'nid', array(), 'book_parent_nid');
75
+    $view->add_item($display, 'argument', 'node', 'nid', $options, $field['id']);
76
+    break;
77
+    }
78
+      break;
79 79
   }
80 80
 }
Please login to merge, or discard this patch.
sites/default/boinc/modules/contrib/views/modules/profile.views_convert.inc 1 patch
Switch Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -21,18 +21,18 @@
 block discarded – undo
21 21
     }
22 22
   }
23 23
   switch ($type) {
24
-    case 'filter':
25
-      if (isset($tables[$field['tablename']])) {
26
-        switch ($profile_fields[$field['tablename']]->type) {
27
-          case 'vocabulary':
28
-          case 'selection':
29
-            $operators = array('AND' => 'in', 'OR' => 'in', 'NOR' => 'not in');
30
-            $view->set_item_option($display, 'filter', $id, 'operator', $operators[$field['operator']]);
31
-            break;
32
-          default:
33
-            $view->set_item_option($display, 'filter', $id, 'operator', $field['operator']);
34
-            break;
35
-        }
24
+  case 'filter':
25
+    if (isset($tables[$field['tablename']])) {
26
+      switch ($profile_fields[$field['tablename']]->type) {
27
+      case 'vocabulary':
28
+      case 'selection':
29
+      $operators = array('AND' => 'in', 'OR' => 'in', 'NOR' => 'not in');
30
+      $view->set_item_option($display, 'filter', $id, 'operator', $operators[$field['operator']]);
31
+      break;
32
+      default:
33
+      $view->set_item_option($display, 'filter', $id, 'operator', $field['operator']);
34
+      break;
35
+      }
36 36
       }
37 37
       break;
38 38
   }
Please login to merge, or discard this patch.
sites/default/boinc/modules/contrib/views/modules/user.views_convert.inc 1 patch
Switch Indentation   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -10,51 +10,51 @@
 block discarded – undo
10 10
  */
11 11
 function user_views_convert($display, $type, &$view, $field, $id = NULL) {
12 12
   switch ($type) {
13
-    case 'field':
14
-      switch ($field['tablename']) {
15
-        case 'users':
16
-          switch ($field['field']) {
17
-            case 'uid':
18
-              $view->set_item_option($display, 'field', $id, 'field', 'picture');
19
-              break;
20
-          }
21
-          break;
13
+  case 'field':
14
+    switch ($field['tablename']) {
15
+    case 'users':
16
+    switch ($field['field']) {
17
+    case 'uid':
18
+    $view->set_item_option($display, 'field', $id, 'field', 'picture');
19
+    break;
20
+    }
21
+        break;
22 22
       }
23 23
       break;
24
-    case 'filter':
25
-      if ($field['tablename'] == 'users' || !strncmp($field['tablename'], 'users_role_', 11)) {
26
-        switch ($field['field']) {
27
-          case 'uid':
28
-            $operators = array('OR' => 'in', 'NOR' => 'not in');
29
-            $view->set_item_option($display, 'filter', $id, 'operator', $operators[$field['operator']]);
30
-            if ($rid = (integer) substr($field['tablename'], 11)) {
31
-              $view->add_item($display, 'filter', 'users_roles', 'rid', array('value' => $rid));
32
-            }
33
-            break;
34
-        }
24
+  case 'filter':
25
+    if ($field['tablename'] == 'users' || !strncmp($field['tablename'], 'users_role_', 11)) {
26
+      switch ($field['field']) {
27
+      case 'uid':
28
+      $operators = array('OR' => 'in', 'NOR' => 'not in');
29
+      $view->set_item_option($display, 'filter', $id, 'operator', $operators[$field['operator']]);
30
+      if ($rid = (integer) substr($field['tablename'], 11)) {
31
+      $view->add_item($display, 'filter', 'users_roles', 'rid', array('value' => $rid));
32
+      }
33
+      break;
34
+      }
35 35
       }
36 36
       elseif ($field['tablename'] == 'users_roles') {
37 37
         switch ($field['field']) {
38
-          case 'rid':
39
-            $operators = array('AND' => 'and', 'OR' => 'or', 'NOR' => 'not');
40
-            $view->set_item_option($display, 'filter', $id, 'operator', $operators[$field['operator']]);
41
-            break;
38
+        case 'rid':
39
+          $operators = array('AND' => 'and', 'OR' => 'or', 'NOR' => 'not');
40
+          $view->set_item_option($display, 'filter', $id, 'operator', $operators[$field['operator']]);
41
+          break;
42 42
         }
43 43
       }
44 44
       break;
45
-    case 'argument':
46
-      $options = $field['argoptions'];
47
-      switch ($field['type']) {
48
-        case 'uid':
49
-          $view->add_item($display, 'argument', 'users', 'uid', $options, $field['id']);
50
-          break;
51
-        case 'uidtouch':
52
-          $view->add_item($display, 'argument', 'node', 'uid_touch', $options, $field['id']);
53
-          break;
54
-        case 'username':
55
-          $view->add_item($display, 'argument', 'users', 'name', $options, $field['id']);
56
-          break;
57
-      }
45
+  case 'argument':
46
+    $options = $field['argoptions'];
47
+    switch ($field['type']) {
48
+    case 'uid':
49
+    $view->add_item($display, 'argument', 'users', 'uid', $options, $field['id']);
50
+    break;
51
+    case 'uidtouch':
52
+    $view->add_item($display, 'argument', 'node', 'uid_touch', $options, $field['id']);
53
+    break;
54
+    case 'username':
55
+    $view->add_item($display, 'argument', 'users', 'name', $options, $field['id']);
56
+    break;
57
+    }
58 58
       break;
59 59
   }
60 60
 }
Please login to merge, or discard this patch.
sites/default/boinc/modules/contrib/views/modules/upload.views_convert.inc 1 patch
Switch Indentation   +78 added lines, -78 removed lines patch added patch discarded remove patch
@@ -14,93 +14,93 @@
 block discarded – undo
14 14
  */
15 15
 function upload_views_convert($display, $type, &$view, $field, $id = NULL) {
16 16
   switch ($type) {
17
-    case 'field':
18
-      switch ($field['tablename']) {
19
-        case 'file_revisions':
20
-          switch ($field['field']) {
21
-            case 'fid':
22
-              $relationship = $view->add_item($display, 'relationship', 'node', 'upload_fid', array(), 'node_upload_fid');
23
-              $view->set_item_option($display, 'field', $id, 'relationship', $relationship);
24
-              $view->set_item_option($display, 'field', $id, 'table', 'files');
25
-              break;
17
+  case 'field':
18
+    switch ($field['tablename']) {
19
+    case 'file_revisions':
20
+    switch ($field['field']) {
21
+    case 'fid':
22
+    $relationship = $view->add_item($display, 'relationship', 'node', 'upload_fid', array(), 'node_upload_fid');
23
+    $view->set_item_option($display, 'field', $id, 'relationship', $relationship);
24
+    $view->set_item_option($display, 'field', $id, 'table', 'files');
25
+    break;
26
+    }
27
+        break;
28
+    case 'files':
29
+      switch ($field['field']) {
30
+      case 'all_files':
31
+      $item = $view->get_item($display, 'field', $id);
32
+      switch ($field['options']) {
33
+      case 'link':
34
+      $item['link_to_file'] = TRUE;
35
+      break;
36
+      case 'linkdesc':
37
+      $item['link_to_file'] = TRUE;
38
+      case 'nolinkdesc':
39
+      $item['alter']['alter_text'] = TRUE;
40
+      $item['alter']['text'] = '['. $view->add_item($display, 'field', 'upload', 'description', array('exclude' => TRUE)) .']';
41
+      break;
42
+      }
43
+          if ($field['handler'] == 'views_handler_file_listed_files') {
44
+            $item['only_listed'] = TRUE;
26 45
           }
46
+          $item['table'] = 'node';
47
+          $item['field'] = 'upload_fid';
48
+          $view->set_item($display, 'field', $id, $item);
27 49
           break;
28
-        case 'files':
29
-          switch ($field['field']) {
30
-            case 'all_files':
31
-              $item = $view->get_item($display, 'field', $id);
32
-              switch ($field['options']) {
33
-                case 'link':
34
-                  $item['link_to_file'] = TRUE;
35
-                  break;
36
-                case 'linkdesc':
37
-                  $item['link_to_file'] = TRUE;
38
-                case 'nolinkdesc':
39
-                  $item['alter']['alter_text'] = TRUE;
40
-                  $item['alter']['text'] = '['. $view->add_item($display, 'field', 'upload', 'description', array('exclude' => TRUE)) .']';
41
-                  break;
42
-              }
43
-              if ($field['handler'] == 'views_handler_file_listed_files') {
44
-                $item['only_listed'] = TRUE;
45
-              }
46
-              $item['table'] = 'node';
47
-              $item['field'] = 'upload_fid';
48
-              $view->set_item($display, 'field', $id, $item);
49
-              break;
50
-            case 'filename':
51
-              if ($field['handler'] == 'views_handler_file_filename_download') {
52
-                $view->set_item_option($display, 'field', $id, 'link_to_file', TRUE);
53
-              }
54
-              $relationship = $view->add_item($display, 'relationship', 'node', 'upload_fid', array(), 'node_upload_fid');
55
-              $view->set_item_option($display, 'field', $id, 'relationship', $relationship);
56
-              break;
50
+      case 'filename':
51
+        if ($field['handler'] == 'views_handler_file_filename_download') {
52
+          $view->set_item_option($display, 'field', $id, 'link_to_file', TRUE);
53
+        }
54
+        $relationship = $view->add_item($display, 'relationship', 'node', 'upload_fid', array(), 'node_upload_fid');
55
+        $view->set_item_option($display, 'field', $id, 'relationship', $relationship);
56
+        break;
57 57
           }
58 58
           break;
59 59
       }
60 60
       break;
61
-    case 'filter':
62
-      switch ($field['tablename']) {
63
-        case 'file_revisions':
64
-          switch ($field['field']) {
65
-            case 'fid':
66
-              $view->set_item_option($display, 'filter', $id, 'table', 'node');
67
-              $view->set_item_option($display, 'filter', $id, 'field', 'upload_fid');
68
-              break;
69
-            case 'list':
70
-              $view->set_item_option($display, 'filter', $id, 'table', 'upload');
71
-              break;
72
-          }
73
-          break;
74
-        case 'files':
75
-          switch ($field['field']) {
76
-            case 'filename':
77
-            case 'filemime':
78
-              $item = $view->get_item($display, 'filter', $id);
79
-              $item['operator'] = $field['operator'];
80
-              $item['case'] = FALSE;
81
-              $item['relationship'] = $view->add_item($display, 'relationship', 'node', 'upload_fid', array(), 'node_upload_fid');
82
-              $view->set_item($display, 'filter', $id, $item);
83
-              break;
84
-            case 'filesize':
85
-              $relationship = $view->add_item($display, 'relationship', 'node', 'upload_fid', array(), 'node_upload_fid');
86
-              $view->set_item_option($display, 'filter', $id, 'relationship', $relationship);
87
-              $view->set_item_option($display, 'filter', $id, 'operator', $field['operator']);
88
-              break;
89
-          }
61
+  case 'filter':
62
+    switch ($field['tablename']) {
63
+    case 'file_revisions':
64
+    switch ($field['field']) {
65
+    case 'fid':
66
+    $view->set_item_option($display, 'filter', $id, 'table', 'node');
67
+    $view->set_item_option($display, 'filter', $id, 'field', 'upload_fid');
68
+    break;
69
+    case 'list':
70
+    $view->set_item_option($display, 'filter', $id, 'table', 'upload');
71
+    break;
72
+    }
73
+        break;
74
+    case 'files':
75
+      switch ($field['field']) {
76
+      case 'filename':
77
+      case 'filemime':
78
+      $item = $view->get_item($display, 'filter', $id);
79
+      $item['operator'] = $field['operator'];
80
+      $item['case'] = FALSE;
81
+      $item['relationship'] = $view->add_item($display, 'relationship', 'node', 'upload_fid', array(), 'node_upload_fid');
82
+      $view->set_item($display, 'filter', $id, $item);
83
+      break;
84
+      case 'filesize':
85
+      $relationship = $view->add_item($display, 'relationship', 'node', 'upload_fid', array(), 'node_upload_fid');
86
+      $view->set_item_option($display, 'filter', $id, 'relationship', $relationship);
87
+      $view->set_item_option($display, 'filter', $id, 'operator', $field['operator']);
88
+      break;
89
+      }
90 90
           break;
91 91
       }
92 92
       break;
93
-    case 'sorts':
94
-      switch ($field['tablename']) {
95
-        case 'file_revisions':
96
-          switch ($field['field']) {
97
-            case 'fid':
98
-              $relationship = $view->add_item($display, 'relationship', 'node', 'upload_fid', array(), 'node_upload_fid');
99
-              $view->set_item_option($display, 'field', $id, 'relationship', $relationship);
100
-              $view->set_item_option($display, 'field', $id, 'table', 'files');
101
-              break;
102
-          }
103
-          break;
93
+  case 'sorts':
94
+    switch ($field['tablename']) {
95
+    case 'file_revisions':
96
+    switch ($field['field']) {
97
+    case 'fid':
98
+    $relationship = $view->add_item($display, 'relationship', 'node', 'upload_fid', array(), 'node_upload_fid');
99
+    $view->set_item_option($display, 'field', $id, 'relationship', $relationship);
100
+    $view->set_item_option($display, 'field', $id, 'table', 'files');
101
+    break;
102
+    }
103
+        break;
104 104
       }
105 105
       break;
106 106
   }
Please login to merge, or discard this patch.
modules/contrib/views/modules/comment/views_handler_field_node_comment.inc 1 patch
Switch Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -6,13 +6,13 @@
 block discarded – undo
6 6
 class views_handler_field_node_comment extends views_handler_field {
7 7
   function render($values) {
8 8
     switch ($values->{$this->field_alias}) {
9
-      case COMMENT_NODE_DISABLED:
10
-      default:
11
-        return t('Disabled');
12
-      case COMMENT_NODE_READ_ONLY:
13
-        return t('Read only');
14
-      case COMMENT_NODE_READ_WRITE:
15
-        return t('Read/Write');
9
+    case COMMENT_NODE_DISABLED:
10
+    default:
11
+      return t('Disabled');
12
+    case COMMENT_NODE_READ_ONLY:
13
+      return t('Read only');
14
+    case COMMENT_NODE_READ_WRITE:
15
+      return t('Read/Write');
16 16
     }
17 17
   }
18 18
 }
Please login to merge, or discard this patch.
views/modules/translation/views_handler_relationship_translation.inc 1 patch
Switch Indentation   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -55,25 +55,25 @@
 block discarded – undo
55 55
     $def['extra'] = array();
56 56
     if ($this->options['language'] != 'all') {
57 57
       switch ($this->options['language']) {
58
-        case 'current':
59
-          $def['extra'][] = array(
60
-            'field' => 'language',
61
-            'value' => '***CURRENT_LANGUAGE***',
62
-          );
63
-          break;
64
-        case 'default':
65
-          $def['extra'][] = array(
66
-            'field' => 'language',
67
-            'value' => '***DEFAULT_LANGUAGE***',
68
-          );
69
-          break;
70
-        // Other values will be the language codes.
71
-        default:
72
-          $def['extra'][] = array(
73
-            'field' => 'language',
74
-            'value' => $this->options['language'],
75
-          );
76
-          break;
58
+      case 'current':
59
+        $def['extra'][] = array(
60
+          'field' => 'language',
61
+          'value' => '***CURRENT_LANGUAGE***',
62
+        );
63
+        break;
64
+      case 'default':
65
+        $def['extra'][] = array(
66
+          'field' => 'language',
67
+          'value' => '***DEFAULT_LANGUAGE***',
68
+        );
69
+        break;
70
+      // Other values will be the language codes.
71
+      default:
72
+        $def['extra'][] = array(
73
+          'field' => 'language',
74
+          'value' => $this->options['language'],
75
+        );
76
+        break;
77 77
       }
78 78
     }
79 79
 
Please login to merge, or discard this patch.
drupal/sites/default/boinc/modules/contrib/views/views_revert.drush.inc 1 patch
Switch Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,8 +9,8 @@
 block discarded – undo
9 9
  */
10 10
 function views_revert_drush_help($section) {
11 11
   switch ($section) {
12
-    case 'drush:revert-views':
13
-      return dt('Reverts all views in the drupal installation that have been overriden. Careful, use with care.');
12
+  case 'drush:revert-views':
13
+    return dt('Reverts all views in the drupal installation that have been overriden. Careful, use with care.');
14 14
   }
15 15
 }
16 16
 
Please login to merge, or discard this patch.
drupal/sites/default/boinc/modules/contrib/views/views.module 1 patch
Switch Indentation   +84 added lines, -84 removed lines patch added patch discarded remove patch
@@ -317,111 +317,111 @@
 block discarded – undo
317 317
  */
318 318
 function views_block($op = 'list', $delta = 0, $edit = array()) {
319 319
   switch ($op) {
320
-    case 'list':
321
-      // Try to avoid instantiating all the views just to get the blocks info.
322
-      views_include('cache');
323
-      $cache = views_cache_get('views_block_items', TRUE);
324
-      if ($cache && is_array($cache->data)) {
325
-        return $cache->data;
326
-      }
320
+  case 'list':
321
+    // Try to avoid instantiating all the views just to get the blocks info.
322
+    views_include('cache');
323
+    $cache = views_cache_get('views_block_items', TRUE);
324
+    if ($cache && is_array($cache->data)) {
325
+      return $cache->data;
326
+    }
327 327
 
328
-      $items = array();
329
-      $views = views_get_all_views();
330
-      foreach ($views as $view) {
331
-        // disabled views get nothing.
332
-        if (!empty($view->disabled)) {
333
-          continue;
334
-        }
328
+    $items = array();
329
+    $views = views_get_all_views();
330
+    foreach ($views as $view) {
331
+      // disabled views get nothing.
332
+      if (!empty($view->disabled)) {
333
+        continue;
334
+      }
335 335
 
336
-        $view->init_display();
337
-        foreach ($view->display as $display_id => $display) {
336
+      $view->init_display();
337
+      foreach ($view->display as $display_id => $display) {
338 338
 
339
-          if (isset($display->handler) && !empty($display->handler->definition['uses hook block'])) {
340
-            $result = $display->handler->execute_hook_block();
341
-            if (is_array($result)) {
342
-              $items = array_merge($items, $result);
343
-            }
339
+        if (isset($display->handler) && !empty($display->handler->definition['uses hook block'])) {
340
+          $result = $display->handler->execute_hook_block();
341
+          if (is_array($result)) {
342
+            $items = array_merge($items, $result);
344 343
           }
344
+        }
345 345
 
346
-          if (isset($display->handler) && $display->handler->get_option('exposed_block')) {
347
-            $result = $display->handler->get_special_blocks();
348
-            if (is_array($result)) {
349
-              $items = array_merge($items, $result);
350
-            }
346
+        if (isset($display->handler) && $display->handler->get_option('exposed_block')) {
347
+          $result = $display->handler->get_special_blocks();
348
+          if (is_array($result)) {
349
+            $items = array_merge($items, $result);
351 350
           }
352 351
         }
353 352
       }
353
+    }
354 354
 
355
-      // block.module has a delta length limit of 32, but our deltas can
356
-      // unfortunately be longer because view names can be 32 and display IDs
357
-      // can also be 32. So for very long deltas, change to md5 hashes.
358
-      $hashes = array();
359
-
360
-      // get the keys because we're modifying the array and we don't want to
361
-      // confuse PHP too much.
362
-      $keys = array_keys($items);
363
-      foreach ($keys as $delta) {
364
-        if (strlen($delta) >= 32) {
365
-          $hash = md5($delta);
366
-          $hashes[$hash] = $delta;
367
-          $items[$hash] = $items[$delta];
368
-          unset($items[$delta]);
369
-        }
355
+    // block.module has a delta length limit of 32, but our deltas can
356
+    // unfortunately be longer because view names can be 32 and display IDs
357
+    // can also be 32. So for very long deltas, change to md5 hashes.
358
+    $hashes = array();
359
+
360
+    // get the keys because we're modifying the array and we don't want to
361
+    // confuse PHP too much.
362
+    $keys = array_keys($items);
363
+    foreach ($keys as $delta) {
364
+      if (strlen($delta) >= 32) {
365
+        $hash = md5($delta);
366
+        $hashes[$hash] = $delta;
367
+        $items[$hash] = $items[$delta];
368
+        unset($items[$delta]);
370 369
       }
370
+    }
371 371
 
372
-      // Only save hashes if they have changed.
373
-      $old_hashes = variable_get('views_block_hashes', array());
374
-      if ($hashes != $old_hashes) {
375
-        variable_set('views_block_hashes', $hashes);
376
-      }
377
-      // Save memory: Destroy those views.
378
-      foreach ($views as $view) {
379
-        $view->destroy();
380
-      }
372
+    // Only save hashes if they have changed.
373
+    $old_hashes = variable_get('views_block_hashes', array());
374
+    if ($hashes != $old_hashes) {
375
+      variable_set('views_block_hashes', $hashes);
376
+    }
377
+    // Save memory: Destroy those views.
378
+    foreach ($views as $view) {
379
+      $view->destroy();
380
+    }
381 381
 
382
-      views_cache_set('views_block_items', $items, TRUE);
382
+    views_cache_set('views_block_items', $items, TRUE);
383 383
 
384
-      return $items;
385
-    case 'view':
386
-      $start = views_microtime();
387
-      // if this is 32, this should be an md5 hash.
388
-      if (strlen($delta) == 32) {
389
-        $hashes = variable_get('views_block_hashes', array());
390
-        if (!empty($hashes[$delta])) {
391
-          $delta = $hashes[$delta];
392
-        }
384
+    return $items;
385
+  case 'view':
386
+    $start = views_microtime();
387
+    // if this is 32, this should be an md5 hash.
388
+    if (strlen($delta) == 32) {
389
+      $hashes = variable_get('views_block_hashes', array());
390
+      if (!empty($hashes[$delta])) {
391
+        $delta = $hashes[$delta];
393 392
       }
393
+    }
394 394
 
395
-      // This indicates it's a special one.
396
-      if (substr($delta, 0, 1) == '-') {
397
-        list($nothing, $type, $name, $display_id) = explode('-', $delta);
398
-        // Put the - back on.
399
-        $type = '-' . $type;
400
-        if ($view = views_get_view($name)) {
401
-          if ($view->access($display_id)) {
402
-            $view->set_display($display_id);
403
-            if (isset($view->display_handler)) {
404
-              $output = $view->display_handler->view_special_blocks($type);
405
-              $view->destroy();
406
-              return $output;
407
-            }
395
+    // This indicates it's a special one.
396
+    if (substr($delta, 0, 1) == '-') {
397
+      list($nothing, $type, $name, $display_id) = explode('-', $delta);
398
+      // Put the - back on.
399
+      $type = '-' . $type;
400
+      if ($view = views_get_view($name)) {
401
+        if ($view->access($display_id)) {
402
+          $view->set_display($display_id);
403
+          if (isset($view->display_handler)) {
404
+            $output = $view->display_handler->view_special_blocks($type);
405
+            $view->destroy();
406
+            return $output;
408 407
           }
409
-          $view->destroy();
410 408
         }
409
+        $view->destroy();
411 410
       }
411
+    }
412 412
 
413
-      list($name, $display_id) = explode('-', $delta);
414
-      // Load the view
415
-      if ($view = views_get_view($name)) {
416
-        if ($view->access($display_id)) {
417
-          $output = $view->execute_display($display_id);
418
-          vpr("Block $view->name execute time: " . (views_microtime() - $start) * 1000 . "ms");
419
-          $view->destroy();
420
-          return $output;
421
-        }
413
+    list($name, $display_id) = explode('-', $delta);
414
+    // Load the view
415
+    if ($view = views_get_view($name)) {
416
+      if ($view->access($display_id)) {
417
+        $output = $view->execute_display($display_id);
418
+        vpr("Block $view->name execute time: " . (views_microtime() - $start) * 1000 . "ms");
422 419
         $view->destroy();
420
+        return $output;
423 421
       }
424
-      break;
422
+      $view->destroy();
423
+    }
424
+    break;
425 425
   }
426 426
 }
427 427
 
Please login to merge, or discard this patch.
drupal/sites/default/boinc/modules/contrib/views/views_ui.module 1 patch
Switch Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -159,8 +159,8 @@
 block discarded – undo
159 159
  */
160 160
 function views_ui_help($path, $arg = '') {
161 161
   switch ($path) {
162
-    case 'admin/build/views/tools/convert':
163
-      return '<p>' . t('The converter will make a best-effort attempt to convert a Views 1 view to Views 2. This conversion is not reliable; you will very likely have to make adjustments to your view to get it to match. You can import Views 1 views through the normal Import tab.') . '</p>';
162
+  case 'admin/build/views/tools/convert':
163
+    return '<p>' . t('The converter will make a best-effort attempt to convert a Views 1 view to Views 2. This conversion is not reliable; you will very likely have to make adjustments to your view to get it to match. You can import Views 1 views through the normal Import tab.') . '</p>';
164 164
   }
165 165
 }
166 166
 
Please login to merge, or discard this patch.