Completed
Push — develop ( 61b96c...a55ed0 )
by Zack
16:44 queued 13:30
created
future/includes/class-gv-logger-wp-action.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 	protected function log( $level, $message, $context ) {
29 29
 
30 30
 		$backtrace = debug_backtrace();
31
-		$location = $this->interpolate( "{class}{type}{function}", $backtrace[2] );
31
+		$location = $this->interpolate( "{class}{type}{function}", $backtrace[ 2 ] );
32 32
 
33 33
 		$message = $this->interpolate( "[$level, $location] $message", $context );
34 34
 
@@ -52,14 +52,14 @@  discard block
 block discarded – undo
52 52
 			do_action(
53 53
 				sprintf( 'gravityview_log_%s_test', $action ),
54 54
 				$this->interpolate( $message, $context ),
55
-				empty( $context['data'] ) ? array() : $context['data']
55
+				empty( $context[ 'data' ] ) ? array() : $context[ 'data' ]
56 56
 			);
57 57
 		}
58 58
 		
59 59
 		do_action(
60 60
 			sprintf( 'gravityview_log_%s', $action ),
61 61
 			$this->interpolate( $message, $context ),
62
-			empty( $context['data'] ) ? array() : $context['data']
62
+			empty( $context[ 'data' ] ) ? array() : $context[ 'data' ]
63 63
 		);
64 64
 	}
65 65
 }
Please login to merge, or discard this patch.
future/includes/class-gv-logger.php 3 patches
Indentation   +119 added lines, -119 removed lines patch added patch discarded remove patch
@@ -10,14 +10,14 @@  discard block
 block discarded – undo
10 10
  * Describes log levels.
11 11
  */
12 12
 class LogLevel {
13
-    const EMERGENCY = 'emergency';
14
-    const ALERT     = 'alert';
15
-    const CRITICAL  = 'critical';
16
-    const ERROR     = 'error';
17
-    const WARNING   = 'warning';
18
-    const NOTICE    = 'notice';
19
-    const INFO      = 'info';
20
-    const DEBUG     = 'debug';
13
+	const EMERGENCY = 'emergency';
14
+	const ALERT     = 'alert';
15
+	const CRITICAL  = 'critical';
16
+	const ERROR     = 'error';
17
+	const WARNING   = 'warning';
18
+	const NOTICE    = 'notice';
19
+	const INFO      = 'info';
20
+	const DEBUG     = 'debug';
21 21
 }
22 22
 
23 23
 /**
@@ -28,127 +28,127 @@  discard block
 block discarded – undo
28 28
  * @see https://github.com/php-fig/log/blob/master/Psr/Log/AbstractLogger.php
29 29
  */
30 30
 abstract class Logger /** @todo extends Psr\Log\AbstractLogger */ {
31
-    /**
32
-     * System is unusable.
33
-     *
34
-     * @param string $message
35
-     * @param array  $context
36
-     *
37
-     * @return void
38
-     */
39
-    public function emergency($message, array $context = array())
40
-    {
41
-        $this->log(LogLevel::EMERGENCY, $message, $context);
42
-    }
31
+	/**
32
+	 * System is unusable.
33
+	 *
34
+	 * @param string $message
35
+	 * @param array  $context
36
+	 *
37
+	 * @return void
38
+	 */
39
+	public function emergency($message, array $context = array())
40
+	{
41
+		$this->log(LogLevel::EMERGENCY, $message, $context);
42
+	}
43 43
 
44
-    /**
45
-     * Action must be taken immediately.
46
-     *
47
-     * Example: Entire website down, database unavailable, etc. This should
48
-     * trigger the SMS alerts and wake you up.
49
-     *
50
-     * @param string $message
51
-     * @param array  $context
52
-     *
53
-     * @return void
54
-     */
55
-    public function alert($message, array $context = array())
56
-    {
57
-        $this->log(LogLevel::ALERT, $message, $context);
58
-    }
44
+	/**
45
+	 * Action must be taken immediately.
46
+	 *
47
+	 * Example: Entire website down, database unavailable, etc. This should
48
+	 * trigger the SMS alerts and wake you up.
49
+	 *
50
+	 * @param string $message
51
+	 * @param array  $context
52
+	 *
53
+	 * @return void
54
+	 */
55
+	public function alert($message, array $context = array())
56
+	{
57
+		$this->log(LogLevel::ALERT, $message, $context);
58
+	}
59 59
 
60
-    /**
61
-     * Critical conditions.
62
-     *
63
-     * Example: Application component unavailable, unexpected exception.
64
-     *
65
-     * @param string $message
66
-     * @param array  $context
67
-     *
68
-     * @return void
69
-     */
70
-    public function critical($message, array $context = array())
71
-    {
72
-        $this->log(LogLevel::CRITICAL, $message, $context);
73
-    }
60
+	/**
61
+	 * Critical conditions.
62
+	 *
63
+	 * Example: Application component unavailable, unexpected exception.
64
+	 *
65
+	 * @param string $message
66
+	 * @param array  $context
67
+	 *
68
+	 * @return void
69
+	 */
70
+	public function critical($message, array $context = array())
71
+	{
72
+		$this->log(LogLevel::CRITICAL, $message, $context);
73
+	}
74 74
 
75
-    /**
76
-     * Runtime errors that do not require immediate action but should typically
77
-     * be logged and monitored.
78
-     *
79
-     * @param string $message
80
-     * @param array  $context
81
-     *
82
-     * @return void
83
-     */
84
-    public function error($message, array $context = array())
85
-    {
86
-        $this->log(LogLevel::ERROR, $message, $context);
87
-    }
75
+	/**
76
+	 * Runtime errors that do not require immediate action but should typically
77
+	 * be logged and monitored.
78
+	 *
79
+	 * @param string $message
80
+	 * @param array  $context
81
+	 *
82
+	 * @return void
83
+	 */
84
+	public function error($message, array $context = array())
85
+	{
86
+		$this->log(LogLevel::ERROR, $message, $context);
87
+	}
88 88
 
89
-    /**
90
-     * Exceptional occurrences that are not errors.
91
-     *
92
-     * Example: Use of deprecated APIs, poor use of an API, undesirable things
93
-     * that are not necessarily wrong.
94
-     *
95
-     * @param string $message
96
-     * @param array  $context
97
-     *
98
-     * @return void
99
-     */
100
-    public function warning($message, array $context = array())
101
-    {
102
-        $this->log(LogLevel::WARNING, $message, $context);
103
-    }
89
+	/**
90
+	 * Exceptional occurrences that are not errors.
91
+	 *
92
+	 * Example: Use of deprecated APIs, poor use of an API, undesirable things
93
+	 * that are not necessarily wrong.
94
+	 *
95
+	 * @param string $message
96
+	 * @param array  $context
97
+	 *
98
+	 * @return void
99
+	 */
100
+	public function warning($message, array $context = array())
101
+	{
102
+		$this->log(LogLevel::WARNING, $message, $context);
103
+	}
104 104
 
105
-    /**
106
-     * Normal but significant events.
107
-     *
108
-     * @param string $message
109
-     * @param array  $context
110
-     *
111
-     * @return void
112
-     */
113
-    public function notice($message, array $context = array())
114
-    {
115
-        $this->log(LogLevel::NOTICE, $message, $context);
116
-    }
105
+	/**
106
+	 * Normal but significant events.
107
+	 *
108
+	 * @param string $message
109
+	 * @param array  $context
110
+	 *
111
+	 * @return void
112
+	 */
113
+	public function notice($message, array $context = array())
114
+	{
115
+		$this->log(LogLevel::NOTICE, $message, $context);
116
+	}
117 117
 
118
-    /**
119
-     * Interesting events.
120
-     *
121
-     * Example: User logs in, SQL logs.
122
-     *
123
-     * @param string $message
124
-     * @param array  $context
125
-     *
126
-     * @return void
127
-     */
128
-    public function info($message, array $context = array())
129
-    {
130
-        $this->log(LogLevel::INFO, $message, $context);
131
-    }
118
+	/**
119
+	 * Interesting events.
120
+	 *
121
+	 * Example: User logs in, SQL logs.
122
+	 *
123
+	 * @param string $message
124
+	 * @param array  $context
125
+	 *
126
+	 * @return void
127
+	 */
128
+	public function info($message, array $context = array())
129
+	{
130
+		$this->log(LogLevel::INFO, $message, $context);
131
+	}
132 132
 
133
-    /**
134
-     * Detailed debug information.
135
-     *
136
-     * @param string $message
137
-     * @param array  $context
138
-     *
139
-     * @return void
140
-     */
141
-    public function debug($message, array $context = array())
142
-    {
143
-        $this->log(LogLevel::DEBUG, $message, $context);
144
-    }
133
+	/**
134
+	 * Detailed debug information.
135
+	 *
136
+	 * @param string $message
137
+	 * @param array  $context
138
+	 *
139
+	 * @return void
140
+	 */
141
+	public function debug($message, array $context = array())
142
+	{
143
+		$this->log(LogLevel::DEBUG, $message, $context);
144
+	}
145 145
 
146 146
 	/**
147 147
 	 * Bake the context into { } placeholders in the message.
148
-     * @param string $message
149
-     * @param array  $context
150
-     *
151
-     * @return string The baked message;
148
+	 * @param string $message
149
+	 * @param array  $context
150
+	 *
151
+	 * @return string The baked message;
152 152
 	 */
153 153
 	protected function interpolate( $message, $context ) {
154 154
 		foreach ( $context as $key => $val ) {
Please login to merge, or discard this patch.
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -36,9 +36,9 @@  discard block
 block discarded – undo
36 36
      *
37 37
      * @return void
38 38
      */
39
-    public function emergency($message, array $context = array())
39
+    public function emergency( $message, array $context = array() )
40 40
     {
41
-        $this->log(LogLevel::EMERGENCY, $message, $context);
41
+        $this->log( LogLevel::EMERGENCY, $message, $context );
42 42
     }
43 43
 
44 44
     /**
@@ -52,9 +52,9 @@  discard block
 block discarded – undo
52 52
      *
53 53
      * @return void
54 54
      */
55
-    public function alert($message, array $context = array())
55
+    public function alert( $message, array $context = array() )
56 56
     {
57
-        $this->log(LogLevel::ALERT, $message, $context);
57
+        $this->log( LogLevel::ALERT, $message, $context );
58 58
     }
59 59
 
60 60
     /**
@@ -67,9 +67,9 @@  discard block
 block discarded – undo
67 67
      *
68 68
      * @return void
69 69
      */
70
-    public function critical($message, array $context = array())
70
+    public function critical( $message, array $context = array() )
71 71
     {
72
-        $this->log(LogLevel::CRITICAL, $message, $context);
72
+        $this->log( LogLevel::CRITICAL, $message, $context );
73 73
     }
74 74
 
75 75
     /**
@@ -81,9 +81,9 @@  discard block
 block discarded – undo
81 81
      *
82 82
      * @return void
83 83
      */
84
-    public function error($message, array $context = array())
84
+    public function error( $message, array $context = array() )
85 85
     {
86
-        $this->log(LogLevel::ERROR, $message, $context);
86
+        $this->log( LogLevel::ERROR, $message, $context );
87 87
     }
88 88
 
89 89
     /**
@@ -97,9 +97,9 @@  discard block
 block discarded – undo
97 97
      *
98 98
      * @return void
99 99
      */
100
-    public function warning($message, array $context = array())
100
+    public function warning( $message, array $context = array() )
101 101
     {
102
-        $this->log(LogLevel::WARNING, $message, $context);
102
+        $this->log( LogLevel::WARNING, $message, $context );
103 103
     }
104 104
 
105 105
     /**
@@ -110,9 +110,9 @@  discard block
 block discarded – undo
110 110
      *
111 111
      * @return void
112 112
      */
113
-    public function notice($message, array $context = array())
113
+    public function notice( $message, array $context = array() )
114 114
     {
115
-        $this->log(LogLevel::NOTICE, $message, $context);
115
+        $this->log( LogLevel::NOTICE, $message, $context );
116 116
     }
117 117
 
118 118
     /**
@@ -125,9 +125,9 @@  discard block
 block discarded – undo
125 125
      *
126 126
      * @return void
127 127
      */
128
-    public function info($message, array $context = array())
128
+    public function info( $message, array $context = array() )
129 129
     {
130
-        $this->log(LogLevel::INFO, $message, $context);
130
+        $this->log( LogLevel::INFO, $message, $context );
131 131
     }
132 132
 
133 133
     /**
@@ -138,9 +138,9 @@  discard block
 block discarded – undo
138 138
      *
139 139
      * @return void
140 140
      */
141
-    public function debug($message, array $context = array())
141
+    public function debug( $message, array $context = array() )
142 142
     {
143
-        $this->log(LogLevel::DEBUG, $message, $context);
143
+        $this->log( LogLevel::DEBUG, $message, $context );
144 144
     }
145 145
 
146 146
 	/**
Please login to merge, or discard this patch.
Braces   +8 added lines, -16 removed lines patch added patch discarded remove patch
@@ -36,8 +36,7 @@  discard block
 block discarded – undo
36 36
      *
37 37
      * @return void
38 38
      */
39
-    public function emergency($message, array $context = array())
40
-    {
39
+    public function emergency($message, array $context = array()) {
41 40
         $this->log(LogLevel::EMERGENCY, $message, $context);
42 41
     }
43 42
 
@@ -52,8 +51,7 @@  discard block
 block discarded – undo
52 51
      *
53 52
      * @return void
54 53
      */
55
-    public function alert($message, array $context = array())
56
-    {
54
+    public function alert($message, array $context = array()) {
57 55
         $this->log(LogLevel::ALERT, $message, $context);
58 56
     }
59 57
 
@@ -67,8 +65,7 @@  discard block
 block discarded – undo
67 65
      *
68 66
      * @return void
69 67
      */
70
-    public function critical($message, array $context = array())
71
-    {
68
+    public function critical($message, array $context = array()) {
72 69
         $this->log(LogLevel::CRITICAL, $message, $context);
73 70
     }
74 71
 
@@ -81,8 +78,7 @@  discard block
 block discarded – undo
81 78
      *
82 79
      * @return void
83 80
      */
84
-    public function error($message, array $context = array())
85
-    {
81
+    public function error($message, array $context = array()) {
86 82
         $this->log(LogLevel::ERROR, $message, $context);
87 83
     }
88 84
 
@@ -97,8 +93,7 @@  discard block
 block discarded – undo
97 93
      *
98 94
      * @return void
99 95
      */
100
-    public function warning($message, array $context = array())
101
-    {
96
+    public function warning($message, array $context = array()) {
102 97
         $this->log(LogLevel::WARNING, $message, $context);
103 98
     }
104 99
 
@@ -110,8 +105,7 @@  discard block
 block discarded – undo
110 105
      *
111 106
      * @return void
112 107
      */
113
-    public function notice($message, array $context = array())
114
-    {
108
+    public function notice($message, array $context = array()) {
115 109
         $this->log(LogLevel::NOTICE, $message, $context);
116 110
     }
117 111
 
@@ -125,8 +119,7 @@  discard block
 block discarded – undo
125 119
      *
126 120
      * @return void
127 121
      */
128
-    public function info($message, array $context = array())
129
-    {
122
+    public function info($message, array $context = array()) {
130 123
         $this->log(LogLevel::INFO, $message, $context);
131 124
     }
132 125
 
@@ -138,8 +131,7 @@  discard block
 block discarded – undo
138 131
      *
139 132
      * @return void
140 133
      */
141
-    public function debug($message, array $context = array())
142
-    {
134
+    public function debug($message, array $context = array()) {
143 135
         $this->log(LogLevel::DEBUG, $message, $context);
144 136
     }
145 137
 
Please login to merge, or discard this patch.
future/includes/class-gv-collection-entry-filter-gravityforms.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -55,10 +55,10 @@
 block discarded – undo
55 55
 						$search_criteria[ $key ] = $field_filters;
56 56
 					}
57 57
 
58
-					if ( ! empty( $b[ $key ]['mode'] ) ) {
59
-						$search_criteria[ $key ]['mode' ] = $b[ $key ]['mode'];
60
-					} else if ( ! empty( $a[ $key ]['mode'] ) ) {
61
-						$search_criteria[ $key ]['mode' ] = $a[ $key ]['mode'];
58
+					if ( ! empty( $b[ $key ][ 'mode' ] ) ) {
59
+						$search_criteria[ $key ][ 'mode' ] = $b[ $key ][ 'mode' ];
60
+					} else if ( ! empty( $a[ $key ][ 'mode' ] ) ) {
61
+						$search_criteria[ $key ][ 'mode' ] = $a[ $key ][ 'mode' ];
62 62
 					}
63 63
 					break;
64 64
 				case 'start_date':
Please login to merge, or discard this patch.
future/includes/class-gv-settings.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 	 * @return void
27 27
 	 */
28 28
 	public function set( $key, $value ) {
29
-		$this->settings[$key] = $value;
29
+		$this->settings[ $key ] = $value;
30 30
 	}
31 31
 
32 32
 	/**
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 	 * @return mixed|null
41 41
 	 */
42 42
 	public function get( $key, $default = null ) {
43
-		return isset( $this->settings[$key] ) ? $this->settings[$key] : $default;
43
+		return isset( $this->settings[ $key ] ) ? $this->settings[ $key ] : $default;
44 44
 	}
45 45
 
46 46
 	/**
Please login to merge, or discard this patch.
future/includes/class-gv-field.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -144,19 +144,19 @@
 block discarded – undo
144 144
 	public function from_configuration( $configuration ) {
145 145
 		$configuration = wp_parse_args( $configuration, $this->as_configuration() );
146 146
 
147
-		$this->ID = $configuration['id'];
148
-		$this->label = $configuration['label'];
149
-		$this->show_label = $configuration['show_label'] == '1';
150
-		$this->custom_label = $configuration['custom_label'];
151
-		$this->custom_class = $configuration['custom_class'];
152
-		$this->cap = $configuration['only_loggedin'] == '1' ? $configuration['only_loggedin_cap'] : '';
153
-		$this->search_filter = $configuration['search_filter'] == '1';
154
-		$this->show_as_link = $configuration['show_as_link'] == '1';
147
+		$this->ID = $configuration[ 'id' ];
148
+		$this->label = $configuration[ 'label' ];
149
+		$this->show_label = $configuration[ 'show_label' ] == '1';
150
+		$this->custom_label = $configuration[ 'custom_label' ];
151
+		$this->custom_class = $configuration[ 'custom_class' ];
152
+		$this->cap = $configuration[ 'only_loggedin' ] == '1' ? $configuration[ 'only_loggedin_cap' ] : '';
153
+		$this->search_filter = $configuration[ 'search_filter' ] == '1';
154
+		$this->show_as_link = $configuration[ 'show_as_link' ] == '1';
155 155
 
156 156
 		/** Shared among all field types (sort of). */
157 157
 		$shared_configuration_keys = array(
158 158
 			'id', 'label', 'show_label', 'custom_label', 'custom_class',
159
-			'only_loggedin' ,'only_loggedin_cap', 'search_filter', 'show_as_link',
159
+			'only_loggedin', 'only_loggedin_cap', 'search_filter', 'show_as_link',
160 160
 		);
161 161
 
162 162
 		/** Everything else goes into the properties for now. @todo subclasses! */
Please login to merge, or discard this patch.
future/lib/class-gamajo-template-loader.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
 		public function set_template_data( array $data, $var_name = 'data' ) {
118 118
 			global $wp_query;
119 119
 
120
-			$wp_query->query_vars[ $var_name ] = (object) $data;
120
+			$wp_query->query_vars[ $var_name ] = (object)$data;
121 121
 		}
122 122
 
123 123
 		/**
@@ -130,8 +130,8 @@  discard block
 block discarded – undo
130 130
 		public function unset_template_data() {
131 131
 			global $wp_query;
132 132
 
133
-			if ( isset( $wp_query->query_vars['data'] ) ) {
134
-				unset( $wp_query->query_vars['data'] );
133
+			if ( isset( $wp_query->query_vars[ 'data' ] ) ) {
134
+				unset( $wp_query->query_vars[ 'data' ] );
135 135
 			}
136 136
 		}
137 137
 
@@ -148,9 +148,9 @@  discard block
 block discarded – undo
148 148
 		protected function get_template_file_names( $slug, $name ) {
149 149
 			$templates = array();
150 150
 			if ( isset( $name ) ) {
151
-				$templates[] = $slug . '-' . $name . '.php';
151
+				$templates[ ] = $slug . '-' . $name . '.php';
152 152
 			}
153
-			$templates[] = $slug . '.php';
153
+			$templates[ ] = $slug . '.php';
154 154
 
155 155
 			/**
156 156
 			 * Allow template choices to be filtered.
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 			$located = false;
189 189
 
190 190
 			// Remove empty entries.
191
-			$template_names = array_filter( (array) $template_names );
191
+			$template_names = array_filter( (array)$template_names );
192 192
 			$template_paths = $this->get_template_paths();
193 193
 
194 194
 			// Try to find a template file.
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
 
234 234
 			// Only add this conditionally, so non-child themes don't redundantly check active theme twice.
235 235
 			if ( is_child_theme() ) {
236
-				$file_paths[1] = trailingslashit( get_stylesheet_directory() ) . $theme_directory;
236
+				$file_paths[ 1 ] = trailingslashit( get_stylesheet_directory() ) . $theme_directory;
237 237
 			}
238 238
 
239 239
 			/**
Please login to merge, or discard this patch.
includes/plugin-and-theme-hooks/class-gravityview-plugin-hooks-acf.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 			return $meta_keys;
49 49
 		}
50 50
 
51
-		if( $acf_keys = get_field_objects( $post_id, array( 'load_value' => false ) ) ) {
51
+		if ( $acf_keys = get_field_objects( $post_id, array( 'load_value' => false ) ) ) {
52 52
 			return array_merge( array_keys( $acf_keys ), $meta_keys );
53 53
 		}
54 54
 
@@ -63,9 +63,9 @@  discard block
 block discarded – undo
63 63
 	 * @return void
64 64
 	 */
65 65
 	private function fix_posted_fields() {
66
-		if( is_admin() && isset( $_POST['action'] ) && isset( $_POST['post_type'] ) ) {
67
-			if( 'editpost' === $_POST['action'] && 'gravityview' === $_POST['post_type'] ) {
68
-				$_POST['fields'] = _gravityview_process_posted_fields();
66
+		if ( is_admin() && isset( $_POST[ 'action' ] ) && isset( $_POST[ 'post_type' ] ) ) {
67
+			if ( 'editpost' === $_POST[ 'action' ] && 'gravityview' === $_POST[ 'post_type' ] ) {
68
+				$_POST[ 'fields' ] = _gravityview_process_posted_fields();
69 69
 			}
70 70
 		}
71 71
 	}
Please login to merge, or discard this patch.
future/_mocks.php 2 patches
Doc Comments   +2 added lines patch added patch discarded remove patch
@@ -62,6 +62,8 @@
 block discarded – undo
62 62
  * @internal
63 63
  * @since future
64 64
  *
65
+ * @param integer $form_id
66
+ * @param integer $count
65 67
  * @return array The old associative array data as returned by
66 68
  *  \GravityView_frontend::get_view_entries(), the paging parameters
67 69
  *  and a total count of all entries.
Please login to merge, or discard this patch.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -96,19 +96,19 @@  discard block
 block discarded – undo
96 96
 		$paging = rgar( $parameters, 'paging' );
97 97
 	} else {
98 98
 		$entries = $form->entries
99
-			->filter( \GV\GF_Entry_Filter::from_search_criteria( $criteria['search_criteria'] ) )
100
-			->offset( $args['offset'] )
101
-			->limit( $criteria['paging']['page_size'] );
99
+			->filter( \GV\GF_Entry_Filter::from_search_criteria( $criteria[ 'search_criteria' ] ) )
100
+			->offset( $args[ 'offset' ] )
101
+			->limit( $criteria[ 'paging' ][ 'page_size' ] );
102 102
 
103
-		if ( $criteria['paging']['page_size'] ) {
104
-			$entries = $entries->page( ( ( $criteria['paging']['offset'] - $args['offset'] ) / $criteria['paging']['page_size'] ) + 1 );
103
+		if ( $criteria[ 'paging' ][ 'page_size' ] ) {
104
+			$entries = $entries->page( ( ( $criteria[ 'paging' ][ 'offset' ] - $args[ 'offset' ] ) / $criteria[ 'paging' ][ 'page_size' ] ) + 1 );
105 105
 		}
106 106
 
107
-		if ( ! empty( $criteria['sorting'] ) ) {
107
+		if ( ! empty( $criteria[ 'sorting' ] ) ) {
108 108
 			$field = new \GV\Field();
109
-			$field->ID = $criteria['sorting']['key'];
110
-			$direction = strtolower( $criteria['sorting']['direction'] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
111
-			$mode = $criteria['sorting']['is_numeric'] ? \GV\Entry_Sort::NUMERIC : \GV\Entry_Sort::ALPHA;
109
+			$field->ID = $criteria[ 'sorting' ][ 'key' ];
110
+			$direction = strtolower( $criteria[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
111
+			$mode = $criteria[ 'sorting' ][ 'is_numeric' ] ? \GV\Entry_Sort::NUMERIC : \GV\Entry_Sort::ALPHA;
112 112
 			$entries = $entries->sort( new \GV\Entry_Sort( $field, $direction, $mode ) );
113 113
 		}
114 114
 
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 
135 135
 /** Add some global fix for field capability discrepancies. */
136 136
 add_filter( 'gravityview/configuration/fields', function( $fields ) {
137
-	if ( empty( $fields  ) ) {
137
+	if ( empty( $fields ) ) {
138 138
 		return $fields;
139 139
 	}
140 140
 
@@ -161,11 +161,11 @@  discard block
 block discarded – undo
161 161
 		}
162 162
 
163 163
 		foreach ( $_fields as $uid => &$_field ) {
164
-			if ( ! isset( $_field['only_loggedin'] ) ) {
164
+			if ( ! isset( $_field[ 'only_loggedin' ] ) ) {
165 165
 				continue;
166 166
 			}
167 167
 			/** If we do not require login, we don't require a cap. */
168
-			$_field['only_loggedin'] != '1' && ( $_field['only_loggedin_cap'] = '' );
168
+			$_field[ 'only_loggedin' ] != '1' && ( $_field[ 'only_loggedin_cap' ] = '' );
169 169
 		}
170 170
 	}
171 171
 	return $fields;
Please login to merge, or discard this patch.
future/loader.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
 }
6 6
 
7 7
 /** The future branch of GravityView requires PHP 5.3+ namespaces and SPL. */
8
-if ( version_compare( phpversion(), '5.3' , '<' ) ) {
8
+if ( version_compare( phpversion(), '5.3', '<' ) ) {
9 9
 	return false;
10 10
 
11 11
 /** Tests with a suppressed future. */
Please login to merge, or discard this patch.