Completed
Pull Request — master (#605)
by Zack
05:45
created
includes/extensions/edit-entry/class-edit-entry.php 1 patch
Spacing   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
  * @copyright Copyright 2014, Katz Web Services, Inc.
12 12
  */
13 13
 
14
-if ( ! defined( 'WPINC' ) ) {
14
+if (!defined('WPINC')) {
15 15
 	die;
16 16
 }
17 17
 
@@ -34,18 +34,18 @@  discard block
 block discarded – undo
34 34
 
35 35
 	function __construct() {
36 36
 
37
-        self::$file = plugin_dir_path( __FILE__ );
37
+        self::$file = plugin_dir_path(__FILE__);
38 38
 
39
-        if( is_admin() ) {
40
-            $this->load_components( 'admin' );
39
+        if (is_admin()) {
40
+            $this->load_components('admin');
41 41
         }
42 42
 
43 43
 
44
-        $this->load_components( 'render' );
44
+        $this->load_components('render');
45 45
 
46 46
         // If GF User Registration Add-on exists
47
-        if( class_exists( 'GFUser' ) ) {
48
-            $this->load_components( 'user-registration' );
47
+        if (class_exists('GFUser')) {
48
+            $this->load_components('user-registration');
49 49
         }
50 50
 
51 51
         $this->add_hooks();
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 
58 58
     static function getInstance() {
59 59
 
60
-        if( empty( self::$instance ) ) {
60
+        if (empty(self::$instance)) {
61 61
             self::$instance = new GravityView_Edit_Entry;
62 62
         }
63 63
 
@@ -65,33 +65,33 @@  discard block
 block discarded – undo
65 65
     }
66 66
 
67 67
 
68
-    private function load_components( $component ) {
68
+    private function load_components($component) {
69 69
 
70
-        $dir = trailingslashit( self::$file );
70
+        $dir = trailingslashit(self::$file);
71 71
 
72
-        $filename  = $dir . 'class-edit-entry-' . $component . '.php';
73
-        $classname = 'GravityView_Edit_Entry_' . str_replace( ' ', '_', ucwords( str_replace( '-', ' ', $component ) ) );
72
+        $filename  = $dir.'class-edit-entry-'.$component.'.php';
73
+        $classname = 'GravityView_Edit_Entry_'.str_replace(' ', '_', ucwords(str_replace('-', ' ', $component)));
74 74
 
75 75
         // Loads component and pass extension's instance so that component can
76 76
         // talk each other.
77 77
         require_once $filename;
78
-        $this->instances[ $component ] = new $classname( $this );
79
-        $this->instances[ $component ]->load();
78
+        $this->instances[$component] = new $classname($this);
79
+        $this->instances[$component]->load();
80 80
 
81 81
     }
82 82
 
83 83
     private function add_hooks() {
84 84
 
85 85
         // Add front-end access to Gravity Forms delete file action
86
-        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'RGForms', 'delete_file') );
86
+        add_action('wp_ajax_nopriv_rg_delete_file', array('RGForms', 'delete_file'));
87 87
 
88 88
         // Make sure this hook is run for non-admins
89
-        add_action( 'wp_ajax_rg_delete_file', array( 'RGForms', 'delete_file') );
89
+        add_action('wp_ajax_rg_delete_file', array('RGForms', 'delete_file'));
90 90
 
91
-        add_filter( 'gravityview_blacklist_field_types', array( $this, 'modify_field_blacklist' ), 10, 2 );
91
+        add_filter('gravityview_blacklist_field_types', array($this, 'modify_field_blacklist'), 10, 2);
92 92
 
93 93
         // add template path to check for field
94
-        add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
94
+        add_filter('gravityview_template_paths', array($this, 'add_template_path'));
95 95
 
96 96
     }
97 97
 
@@ -101,8 +101,8 @@  discard block
 block discarded – undo
101 101
 	 */
102 102
 	private function addon_specific_hooks() {
103 103
 
104
-		if( class_exists( 'GFSignature' ) && is_callable( array( 'GFSignature', 'get_instance' ) ) ) {
105
-			add_filter('gform_admin_pre_render', array( GFSignature::get_instance(), 'edit_lead_script'));
104
+		if (class_exists('GFSignature') && is_callable(array('GFSignature', 'get_instance'))) {
105
+			add_filter('gform_admin_pre_render', array(GFSignature::get_instance(), 'edit_lead_script'));
106 106
 		}
107 107
 
108 108
 	}
@@ -111,10 +111,10 @@  discard block
 block discarded – undo
111 111
      * Include this extension templates path
112 112
      * @param array $file_paths List of template paths ordered
113 113
      */
114
-    public function add_template_path( $file_paths ) {
114
+    public function add_template_path($file_paths) {
115 115
 
116 116
         // Index 100 is the default GravityView template path.
117
-        $file_paths[ 110 ] = self::$file;
117
+        $file_paths[110] = self::$file;
118 118
 
119 119
         return $file_paths;
120 120
     }
@@ -128,8 +128,8 @@  discard block
 block discarded – undo
128 128
      * @param $entry_id int Gravity Forms entry id
129 129
      * @return string
130 130
      */
131
-    public static function get_nonce_key( $view_id, $form_id, $entry_id ) {
132
-        return sprintf( 'edit_%d_%d_%d', $view_id, $form_id, $entry_id );
131
+    public static function get_nonce_key($view_id, $form_id, $entry_id) {
132
+        return sprintf('edit_%d_%d_%d', $view_id, $form_id, $entry_id);
133 133
     }
134 134
 
135 135
 
@@ -146,32 +146,32 @@  discard block
 block discarded – undo
146 146
      * @param string|array $field_values Parameters to pass in to the Edit Entry form to prefill data. Uses the same format as Gravity Forms "Allow field to be populated dynamically" {@since 1.9.2} {@see https://www.gravityhelp.com/documentation/article/allow-field-to-be-populated-dynamically/ }
147 147
      * @return string
148 148
      */
149
-    public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) {
149
+    public static function get_edit_link($entry, $view_id, $post_id = null, $field_values = '') {
150 150
 
151
-        $nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id']  );
151
+        $nonce_key = self::get_nonce_key($view_id, $entry['form_id'], $entry['id']);
152 152
 
153
-        $base = gv_entry_link( $entry, $post_id );
153
+        $base = gv_entry_link($entry, $post_id);
154 154
 
155
-        $url = add_query_arg( array(
155
+        $url = add_query_arg(array(
156 156
             'page' => 'gf_entries', // Needed for GFForms::get_page()
157 157
             'view' => 'entry', // Needed for GFForms::get_page()
158
-            'edit' => wp_create_nonce( $nonce_key )
159
-        ), $base );
158
+            'edit' => wp_create_nonce($nonce_key)
159
+        ), $base);
160 160
 
161 161
 	    /**
162 162
 	     * Allow passing params to dynamically populate entry with values
163 163
 	     * @since 1.9.2
164 164
 	     */
165
-	    if( !empty( $field_values ) ) {
165
+	    if (!empty($field_values)) {
166 166
 
167
-		    if( is_array( $field_values ) ) {
167
+		    if (is_array($field_values)) {
168 168
 			    // If already an array, no parse_str() needed
169 169
 			    $params = $field_values;
170 170
 		    } else {
171
-			    parse_str( $field_values, $params );
171
+			    parse_str($field_values, $params);
172 172
 		    }
173 173
 
174
-		    $url = add_query_arg( $params, $url );
174
+		    $url = add_query_arg($params, $url);
175 175
 	    }
176 176
 
177 177
         return $url;
@@ -184,9 +184,9 @@  discard block
 block discarded – undo
184 184
 	 * @param  string|null $context Context
185 185
 	 * @return array          If not edit context, original field blacklist. Otherwise, blacklist including post fields.
186 186
 	 */
187
-	public function modify_field_blacklist( $fields = array(), $context = NULL ) {
187
+	public function modify_field_blacklist($fields = array(), $context = NULL) {
188 188
 
189
-		if( empty( $context ) || $context !== 'edit' ) {
189
+		if (empty($context) || $context !== 'edit') {
190 190
 			return $fields;
191 191
 		}
192 192
 
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
 			// 'payment_method', This is editable in the admin, so allowing it here
208 208
 		);
209 209
 
210
-		return array_merge( $fields, $add_fields );
210
+		return array_merge($fields, $add_fields);
211 211
 	}
212 212
 
213 213
 
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
      * @param int $view_id ID of the view you want to check visibility against {@since 1.9.2}
221 221
      * @return bool
222 222
      */
223
-    public static function check_user_cap_edit_entry( $entry, $view_id = 0 ) {
223
+    public static function check_user_cap_edit_entry($entry, $view_id = 0) {
224 224
 
225 225
         // No permission by default
226 226
         $user_can_edit = false;
@@ -228,13 +228,13 @@  discard block
 block discarded – undo
228 228
         // If they can edit any entries (as defined in Gravity Forms)
229 229
         // Or if they can edit other people's entries
230 230
         // Then we're good.
231
-        if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) {
231
+        if (GVCommon::has_cap(array('gravityforms_edit_entries', 'gravityview_edit_others_entries'), $entry['id'])) {
232 232
 
233
-            do_action('gravityview_log_debug', __METHOD__ . ' - User has ability to edit all entries.');
233
+            do_action('gravityview_log_debug', __METHOD__.' - User has ability to edit all entries.');
234 234
 
235 235
             $user_can_edit = true;
236 236
 
237
-        } else if( !isset( $entry['created_by'] ) ) {
237
+        } else if (!isset($entry['created_by'])) {
238 238
 
239 239
             do_action('gravityview_log_error', 'GravityView_Edit_Entry[check_user_cap_edit_entry] Entry `created_by` doesn\'t exist.');
240 240
 
@@ -243,34 +243,34 @@  discard block
 block discarded – undo
243 243
         } else {
244 244
 
245 245
             // get user_edit setting
246
-            if( empty( $view_id ) || $view_id == GravityView_View::getInstance()->getViewId() ) {
246
+            if (empty($view_id) || $view_id == GravityView_View::getInstance()->getViewId()) {
247 247
                 // if View ID not specified or is the current view
248 248
                 $user_edit = GravityView_View::getInstance()->getAtts('user_edit');
249 249
             } else {
250 250
                 // in case is specified and not the current view
251
-                $user_edit = GVCommon::get_template_setting( $view_id, 'user_edit' );
251
+                $user_edit = GVCommon::get_template_setting($view_id, 'user_edit');
252 252
             }
253 253
 
254 254
             $current_user = wp_get_current_user();
255 255
 
256 256
             // User edit is disabled
257
-            if( empty( $user_edit ) ) {
257
+            if (empty($user_edit)) {
258 258
 
259
-                do_action('gravityview_log_debug', 'GravityView_Edit_Entry[check_user_cap_edit_entry] User Edit is disabled. Returning false.' );
259
+                do_action('gravityview_log_debug', 'GravityView_Edit_Entry[check_user_cap_edit_entry] User Edit is disabled. Returning false.');
260 260
 
261 261
                 $user_can_edit = false;
262 262
             }
263 263
 
264 264
             // User edit is enabled and the logged-in user is the same as the user who created the entry. We're good.
265
-            else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
265
+            else if (is_user_logged_in() && intval($current_user->ID) === intval($entry['created_by'])) {
266 266
 
267
-                do_action('gravityview_log_debug', sprintf( 'GravityView_Edit_Entry[check_user_cap_edit_entry] User %s created the entry.', $current_user->ID ) );
267
+                do_action('gravityview_log_debug', sprintf('GravityView_Edit_Entry[check_user_cap_edit_entry] User %s created the entry.', $current_user->ID));
268 268
 
269 269
                 $user_can_edit = true;
270 270
 
271
-            } else if( ! is_user_logged_in() ) {
271
+            } else if (!is_user_logged_in()) {
272 272
 
273
-                do_action( 'gravityview_log_debug', __METHOD__ . ' No user defined; edit entry requires logged in user' );
273
+                do_action('gravityview_log_debug', __METHOD__.' No user defined; edit entry requires logged in user');
274 274
             }
275 275
 
276 276
         }
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
          * @param[in] array $entry Gravity Forms entry array {@since 1.15}
283 283
          * @param[in] int $view_id ID of the view you want to check visibility against {@since 1.15}
284 284
          */
285
-        $user_can_edit = apply_filters( 'gravityview/edit_entry/user_can_edit_entry', $user_can_edit, $entry, $view_id );
285
+        $user_can_edit = apply_filters('gravityview/edit_entry/user_can_edit_entry', $user_can_edit, $entry, $view_id);
286 286
 
287 287
         return (bool)$user_can_edit;
288 288
     }
Please login to merge, or discard this patch.
includes/extensions/edit-entry/fields/edit_link.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -4,19 +4,19 @@
 block discarded – undo
4 4
 
5 5
 $view_id = $gravityview_view->getViewId();
6 6
 
7
-extract( $gravityview_view->getCurrentField() );
7
+extract($gravityview_view->getCurrentField());
8 8
 
9 9
 // Only show the link to logged-in users.
10
-if( !GravityView_Edit_Entry::check_user_cap_edit_entry( $entry ) ) {
10
+if (!GravityView_Edit_Entry::check_user_cap_edit_entry($entry)) {
11 11
 	return;
12 12
 }
13 13
 
14
-$link_text = empty( $field_settings['edit_link'] ) ? __('Edit Entry', 'gravityview') : $field_settings['edit_link'];
14
+$link_text = empty($field_settings['edit_link']) ? __('Edit Entry', 'gravityview') : $field_settings['edit_link'];
15 15
 
16
-$link_atts = empty( $field_settings['new_window'] ) ? '' : 'target="_blank"';
16
+$link_atts = empty($field_settings['new_window']) ? '' : 'target="_blank"';
17 17
 
18
-$output = apply_filters( 'gravityview_entry_link', GravityView_API::replace_variables( $link_text, $form, $entry ) );
18
+$output = apply_filters('gravityview_entry_link', GravityView_API::replace_variables($link_text, $form, $entry));
19 19
 
20
-$href = GravityView_Edit_Entry::get_edit_link( $entry, $view_id );
20
+$href = GravityView_Edit_Entry::get_edit_link($entry, $view_id);
21 21
 
22
-echo gravityview_get_link( $href, $output, $link_atts );
22
+echo gravityview_get_link($href, $output, $link_atts);
Please login to merge, or discard this patch.
includes/extensions/edit-entry/partials/form-buttons.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
      * @param array $entry The Gravity Forms entry
16 16
      * @param int $view_id The current View ID
17 17
      */
18
-    $back_link = apply_filters( 'gravityview/edit_entry/cancel_link', remove_query_arg( array( 'page', 'view', 'edit' ) ), $object->form, $object->entry, $object->view_id );
18
+    $back_link = apply_filters('gravityview/edit_entry/cancel_link', remove_query_arg(array('page', 'view', 'edit')), $object->form, $object->entry, $object->view_id);
19 19
 
20 20
 	/**
21 21
 	 * @action `gravityview/edit-entry/publishing-action/before` Triggered before the submit buttons in the Edit Entry screen, inside the `<div id="publishing-action">` container.
@@ -24,12 +24,12 @@  discard block
 block discarded – undo
24 24
 	 * @param array $entry The Gravity Forms entry
25 25
 	 * @param int $view_id The current View ID
26 26
 	 */
27
-	do_action( 'gravityview/edit-entry/publishing-action/before', $object->form, $object->entry, $object->view_id );
27
+	do_action('gravityview/edit-entry/publishing-action/before', $object->form, $object->entry, $object->view_id);
28 28
 
29 29
 	?>
30
-	<input id="gform_submit_button_<?php echo esc_attr( $object->form['id'] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-update" type="submit" tabindex="4" value="<?php esc_attr_e( 'Update', 'gravityview'); ?>" name="save" />
30
+	<input id="gform_submit_button_<?php echo esc_attr($object->form['id']); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-update" type="submit" tabindex="4" value="<?php esc_attr_e('Update', 'gravityview'); ?>" name="save" />
31 31
 
32
-	<a class="btn btn-sm button button-small gv-button-cancel" tabindex="5" href="<?php echo esc_url( $back_link ); ?>"><?php esc_attr_e( 'Cancel', 'gravityview' ); ?></a>
32
+	<a class="btn btn-sm button button-small gv-button-cancel" tabindex="5" href="<?php echo esc_url($back_link); ?>"><?php esc_attr_e('Cancel', 'gravityview'); ?></a>
33 33
 	<?php
34 34
 
35 35
 	/**
@@ -39,9 +39,9 @@  discard block
 block discarded – undo
39 39
 	 * @param array $entry The Gravity Forms entry
40 40
 	 * @param int $view_id The current View ID
41 41
 	 */
42
-	do_action( 'gravityview/edit-entry/publishing-action/after', $object->form, $object->entry, $object->view_id );
42
+	do_action('gravityview/edit-entry/publishing-action/after', $object->form, $object->entry, $object->view_id);
43 43
 
44 44
 	?>
45 45
 	<input type="hidden" name="action" value="update" />
46
-	<input type="hidden" name="lid" value="<?php echo esc_attr( $object->entry['id'] ); ?>" />
46
+	<input type="hidden" name="lid" value="<?php echo esc_attr($object->entry['id']); ?>" />
47 47
 </div>
Please login to merge, or discard this patch.
includes/extensions/edit-entry/partials/inline-javascript.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@
 block discarded – undo
6 6
 ?><script type="text/javascript">
7 7
 
8 8
 	function DeleteFile(leadId, fieldId, deleteButton){
9
-		if(confirm('<?php echo esc_js( __("Would you like to permanently delete this file? 'Cancel' to stop. 'OK' to delete", 'gravityview') ); ?>')){
9
+		if(confirm('<?php echo esc_js(__("Would you like to permanently delete this file? 'Cancel' to stop. 'OK' to delete", 'gravityview')); ?>')){
10 10
 			var fileIndex = jQuery(deleteButton).parent().index();
11 11
 			var mysack = new sack("<?php echo admin_url("admin-ajax.php")?>");
12 12
 			mysack.execute = 1;
Please login to merge, or discard this patch.
includes/lib/EDD_SL_Plugin_Updater.php 1 patch
Spacing   +83 added lines, -83 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@  discard block
 block discarded – undo
4 4
 //set_site_transient( 'update_plugins', null );
5 5
 
6 6
 // Exit if accessed directly
7
-if ( ! defined( 'ABSPATH' ) ) exit;
7
+if (!defined('ABSPATH')) exit;
8 8
 
9 9
 /**
10 10
  * Allows plugins to use their own update API.
@@ -29,16 +29,16 @@  discard block
 block discarded – undo
29 29
 	 * @param string  $_plugin_file Path to the plugin file.
30 30
 	 * @param array   $_api_data    Optional data to send with API calls.
31 31
 	 */
32
-	function __construct( $_api_url, $_plugin_file, $_api_data = null ) {
33
-		$this->api_url  = trailingslashit( $_api_url );
32
+	function __construct($_api_url, $_plugin_file, $_api_data = null) {
33
+		$this->api_url  = trailingslashit($_api_url);
34 34
 		$this->api_data = $_api_data;
35
-		$this->name     = plugin_basename( $_plugin_file );
36
-		$this->slug     = basename( $_plugin_file, '.php' );
35
+		$this->name     = plugin_basename($_plugin_file);
36
+		$this->slug     = basename($_plugin_file, '.php');
37 37
 		$this->version  = $_api_data['version'];
38 38
 
39 39
 		// Set up hooks.
40 40
 		$this->init();
41
-		add_action( 'admin_init', array( $this, 'show_changelog' ) );
41
+		add_action('admin_init', array($this, 'show_changelog'));
42 42
 
43 43
 	}
44 44
 
@@ -50,11 +50,11 @@  discard block
 block discarded – undo
50 50
 	 * @return void
51 51
 	 */
52 52
 	public function init() {
53
-		add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
54
-		add_filter( 'plugins_api', array( $this, 'plugins_api_filter' ), 10, 3 );
53
+		add_filter('pre_set_site_transient_update_plugins', array($this, 'check_update'));
54
+		add_filter('plugins_api', array($this, 'plugins_api_filter'), 10, 3);
55 55
 
56
-		remove_action( 'after_plugin_row_' . $this->name, 'wp_plugin_update_row', 10, 2 );
57
-		add_action( 'after_plugin_row_' . $this->name, array( $this, 'show_update_notification' ), 10, 2 );
56
+		remove_action('after_plugin_row_'.$this->name, 'wp_plugin_update_row', 10, 2);
57
+		add_action('after_plugin_row_'.$this->name, array($this, 'show_update_notification'), 10, 2);
58 58
 	}
59 59
 
60 60
 	/**
@@ -70,32 +70,32 @@  discard block
 block discarded – undo
70 70
 	 * @param array   $_transient_data Update array build by WordPress.
71 71
 	 * @return array Modified update array with custom plugin data.
72 72
 	 */
73
-	function check_update( $_transient_data ) {
73
+	function check_update($_transient_data) {
74 74
 
75 75
 		global $pagenow;
76 76
 
77
-		if( ! is_object( $_transient_data ) ) {
77
+		if (!is_object($_transient_data)) {
78 78
 			$_transient_data = new stdClass;
79 79
 		}
80 80
 
81
-		if( 'plugins.php' == $pagenow && is_multisite() ) {
81
+		if ('plugins.php' == $pagenow && is_multisite()) {
82 82
 			return $_transient_data;
83 83
 		}
84 84
 
85
-		if ( empty( $_transient_data->response ) || empty( $_transient_data->response[ $this->name ] ) ) {
85
+		if (empty($_transient_data->response) || empty($_transient_data->response[$this->name])) {
86 86
 
87
-			$version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
87
+			$version_info = $this->api_request('plugin_latest_version', array('slug' => $this->slug));
88 88
 
89
-			if ( false !== $version_info && is_object( $version_info ) && isset( $version_info->new_version ) ) {
89
+			if (false !== $version_info && is_object($version_info) && isset($version_info->new_version)) {
90 90
 
91
-				if( version_compare( $this->version, $version_info->new_version, '<' ) ) {
91
+				if (version_compare($this->version, $version_info->new_version, '<')) {
92 92
 
93
-					$_transient_data->response[ $this->name ] = $version_info;
93
+					$_transient_data->response[$this->name] = $version_info;
94 94
 
95 95
 				}
96 96
 
97 97
 				$_transient_data->last_checked = time();
98
-				$_transient_data->checked[ $this->name ] = $this->version;
98
+				$_transient_data->checked[$this->name] = $this->version;
99 99
 
100 100
 			}
101 101
 
@@ -110,86 +110,86 @@  discard block
 block discarded – undo
110 110
 	 * @param string  $file
111 111
 	 * @param array   $plugin
112 112
 	 */
113
-	public function show_update_notification( $file, $plugin ) {
113
+	public function show_update_notification($file, $plugin) {
114 114
 
115
-		if( ! current_user_can( 'update_plugins' ) ) {
115
+		if (!current_user_can('update_plugins')) {
116 116
 			return;
117 117
 		}
118 118
 
119
-		if( ! is_multisite() ) {
119
+		if (!is_multisite()) {
120 120
 			return;
121 121
 		}
122 122
 
123
-		if ( $this->name != $file ) {
123
+		if ($this->name != $file) {
124 124
 			return;
125 125
 		}
126 126
 
127 127
 		// Remove our filter on the site transient
128
-		remove_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ), 10 );
128
+		remove_filter('pre_set_site_transient_update_plugins', array($this, 'check_update'), 10);
129 129
 
130
-		$update_cache = get_site_transient( 'update_plugins' );
130
+		$update_cache = get_site_transient('update_plugins');
131 131
 
132
-		$update_cache = is_object( $update_cache ) ? $update_cache : new stdClass();
132
+		$update_cache = is_object($update_cache) ? $update_cache : new stdClass();
133 133
 
134
-		if ( empty( $update_cache->response ) || empty( $update_cache->response[ $this->name ] ) ) {
134
+		if (empty($update_cache->response) || empty($update_cache->response[$this->name])) {
135 135
 
136
-			$cache_key    = md5( 'edd_plugin_' .sanitize_key( $this->name ) . '_version_info' );
137
-			$version_info = get_transient( $cache_key );
136
+			$cache_key    = md5('edd_plugin_'.sanitize_key($this->name).'_version_info');
137
+			$version_info = get_transient($cache_key);
138 138
 
139
-			if( false === $version_info ) {
139
+			if (false === $version_info) {
140 140
 
141
-				$version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
141
+				$version_info = $this->api_request('plugin_latest_version', array('slug' => $this->slug));
142 142
 
143
-				set_transient( $cache_key, $version_info, 3600 );
143
+				set_transient($cache_key, $version_info, 3600);
144 144
 			}
145 145
 
146 146
 
147
-			if( ! is_object( $version_info ) ) {
147
+			if (!is_object($version_info)) {
148 148
 				return;
149 149
 			}
150 150
 
151
-			if( version_compare( $this->version, $version_info->new_version, '<' ) ) {
151
+			if (version_compare($this->version, $version_info->new_version, '<')) {
152 152
 
153
-				$update_cache->response[ $this->name ] = $version_info;
153
+				$update_cache->response[$this->name] = $version_info;
154 154
 
155 155
 			}
156 156
 
157 157
 			$update_cache->last_checked = time();
158
-			$update_cache->checked[ $this->name ] = $this->version;
158
+			$update_cache->checked[$this->name] = $this->version;
159 159
 
160
-			set_site_transient( 'update_plugins', $update_cache );
160
+			set_site_transient('update_plugins', $update_cache);
161 161
 
162 162
 		} else {
163 163
 
164
-			$version_info = $update_cache->response[ $this->name ];
164
+			$version_info = $update_cache->response[$this->name];
165 165
 
166 166
 		}
167 167
 
168 168
 		// Restore our filter
169
-		add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
169
+		add_filter('pre_set_site_transient_update_plugins', array($this, 'check_update'));
170 170
 
171
-		if ( ! empty( $update_cache->response[ $this->name ] ) && version_compare( $this->version, $version_info->new_version, '<' ) ) {
171
+		if (!empty($update_cache->response[$this->name]) && version_compare($this->version, $version_info->new_version, '<')) {
172 172
 
173 173
 			// build a plugin list row, with update notification
174
-			$wp_list_table = _get_list_table( 'WP_Plugins_List_Table' );
175
-			echo '<tr class="plugin-update-tr"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">';
174
+			$wp_list_table = _get_list_table('WP_Plugins_List_Table');
175
+			echo '<tr class="plugin-update-tr"><td colspan="'.$wp_list_table->get_column_count().'" class="plugin-update colspanchange"><div class="update-message">';
176 176
 
177
-			$changelog_link = self_admin_url( 'index.php?edd_sl_action=view_plugin_changelog&plugin=' . $this->name . '&slug=' . $this->slug . '&TB_iframe=true&width=772&height=911' );
177
+			$changelog_link = self_admin_url('index.php?edd_sl_action=view_plugin_changelog&plugin='.$this->name.'&slug='.$this->slug.'&TB_iframe=true&width=772&height=911');
178 178
 
179
-			if ( empty( $version_info->download_link ) ) {
179
+			if (empty($version_info->download_link)) {
180 180
 				printf(
181
-					__( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a>.', 'gravityview' ),
182
-					esc_html( $version_info->name ),
183
-					esc_url( $changelog_link ),
184
-					esc_html( $version_info->new_version )
181
+					__('There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a>.', 'gravityview'),
182
+					esc_html($version_info->name),
183
+					esc_url($changelog_link),
184
+					esc_html($version_info->new_version)
185 185
 				);
186 186
 			} else {
187 187
 				printf(
188
-					__( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a> or <a href="%4$s">update now</a>.', 'gravityview' ),
189
-					esc_html( $version_info->name ),
190
-					esc_url( $changelog_link ),
191
-					esc_html( $version_info->new_version ),
192
-					esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) )
188
+					__('There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a> or <a href="%4$s">update now</a>.', 'gravityview'),
189
+					esc_html($version_info->name),
190
+					esc_url($changelog_link),
191
+					esc_html($version_info->new_version),
192
+					esc_url(wp_nonce_url(self_admin_url('update.php?action=upgrade-plugin&plugin=').$this->name, 'upgrade-plugin_'.$this->name))
193 193
 				);
194 194
 			}
195 195
 
@@ -208,16 +208,16 @@  discard block
 block discarded – undo
208 208
 	 * @param object  $_args
209 209
 	 * @return object $_data
210 210
 	 */
211
-	function plugins_api_filter( $_data, $_action = '', $_args = null ) {
211
+	function plugins_api_filter($_data, $_action = '', $_args = null) {
212 212
 
213 213
 
214
-		if ( $_action != 'plugin_information' ) {
214
+		if ($_action != 'plugin_information') {
215 215
 
216 216
 			return $_data;
217 217
 
218 218
 		}
219 219
 
220
-		if ( ! isset( $_args->slug ) || ( $_args->slug != $this->slug ) ) {
220
+		if (!isset($_args->slug) || ($_args->slug != $this->slug)) {
221 221
 
222 222
 			return $_data;
223 223
 
@@ -232,9 +232,9 @@  discard block
 block discarded – undo
232 232
 			)
233 233
 		);
234 234
 
235
-		$api_response = $this->api_request( 'plugin_information', $to_send );
235
+		$api_response = $this->api_request('plugin_information', $to_send);
236 236
 
237
-		if ( false !== $api_response ) {
237
+		if (false !== $api_response) {
238 238
 			$_data = $api_response;
239 239
 		}
240 240
 
@@ -249,9 +249,9 @@  discard block
 block discarded – undo
249 249
 	 * @param string  $url
250 250
 	 * @return object $array
251 251
 	 */
252
-	function http_request_args( $args, $url ) {
252
+	function http_request_args($args, $url) {
253 253
 		// If it is an https request and we are performing a package download, disable ssl verification
254
-		if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) {
254
+		if (strpos($url, 'https://') !== false && strpos($url, 'edd_action=package_download')) {
255 255
 			$args['sslverify'] = false;
256 256
 		}
257 257
 		return $args;
@@ -268,43 +268,43 @@  discard block
 block discarded – undo
268 268
 	 * @param array   $_data   Parameters for the API action.
269 269
 	 * @return false|object
270 270
 	 */
271
-	private function api_request( $_action, $_data ) {
271
+	private function api_request($_action, $_data) {
272 272
 
273 273
 		global $wp_version;
274 274
 
275
-		$data = array_merge( $this->api_data, $_data );
275
+		$data = array_merge($this->api_data, $_data);
276 276
 
277
-		if ( $data['slug'] != $this->slug ) {
277
+		if ($data['slug'] != $this->slug) {
278 278
 			return;
279 279
 		}
280 280
 
281
-		if( $this->api_url == home_url() ) {
281
+		if ($this->api_url == home_url()) {
282 282
 			return false; // Don't allow a plugin to ping itself
283 283
 		}
284 284
 
285 285
 		$api_params = array(
286 286
 			'edd_action' => 'get_version',
287
-			'license'    => ! empty( $data['license'] ) ? $data['license'] : '',
288
-			'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
289
-			'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
287
+			'license'    => !empty($data['license']) ? $data['license'] : '',
288
+			'item_name'  => isset($data['item_name']) ? $data['item_name'] : false,
289
+			'item_id'    => isset($data['item_id']) ? $data['item_id'] : false,
290 290
 			'slug'       => $data['slug'],
291 291
 			'author'     => $data['author'],
292 292
 			'url'        => home_url()
293 293
 		);
294 294
 
295
-		$request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => false, 'body' => $api_params ) );
295
+		$request = wp_remote_post($this->api_url, array('timeout' => 15, 'sslverify' => false, 'body' => $api_params));
296 296
 
297
-		if ( ! is_wp_error( $request ) ) {
298
-			$request = json_decode( wp_remote_retrieve_body( $request ) );
297
+		if (!is_wp_error($request)) {
298
+			$request = json_decode(wp_remote_retrieve_body($request));
299 299
 		}
300 300
 
301
-		if ( $request ) {
302
-			if( isset( $request->sections ) ) {
303
-				$request->sections = maybe_unserialize( $request->sections );
301
+		if ($request) {
302
+			if (isset($request->sections)) {
303
+				$request->sections = maybe_unserialize($request->sections);
304 304
 			}
305 305
 
306
-			if( isset( $request->banners ) ) {
307
-				$request->banners = (array)maybe_unserialize( $request->banners );
306
+			if (isset($request->banners)) {
307
+				$request->banners = (array)maybe_unserialize($request->banners);
308 308
 			}
309 309
 		} else {
310 310
 			$request = false;
@@ -316,26 +316,26 @@  discard block
 block discarded – undo
316 316
 	public function show_changelog() {
317 317
 
318 318
 
319
-		if( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) {
319
+		if (empty($_REQUEST['edd_sl_action']) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action']) {
320 320
 			return;
321 321
 		}
322 322
 
323
-		if( empty( $_REQUEST['plugin'] ) ) {
323
+		if (empty($_REQUEST['plugin'])) {
324 324
 			return;
325 325
 		}
326 326
 
327
-		if( empty( $_REQUEST['slug'] ) ) {
327
+		if (empty($_REQUEST['slug'])) {
328 328
 			return;
329 329
 		}
330 330
 
331
-		if( ! current_user_can( 'update_plugins' ) ) {
332
-			wp_die( __( 'You do not have permission to install plugin updates', 'gravityview' ), __( 'Error', 'gravityview' ), array( 'response' => 403 ) );
331
+		if (!current_user_can('update_plugins')) {
332
+			wp_die(__('You do not have permission to install plugin updates', 'gravityview'), __('Error', 'gravityview'), array('response' => 403));
333 333
 		}
334 334
 
335
-		$response = $this->api_request( 'plugin_latest_version', array( 'slug' => $_REQUEST['slug'] ) );
335
+		$response = $this->api_request('plugin_latest_version', array('slug' => $_REQUEST['slug']));
336 336
 
337
-		if( $response && isset( $response->sections['changelog'] ) ) {
338
-			echo '<div style="background:#fff;padding:10px;">' . $response->sections['changelog'] . '</div>';
337
+		if ($response && isset($response->sections['changelog'])) {
338
+			echo '<div style="background:#fff;padding:10px;">'.$response->sections['changelog'].'</div>';
339 339
 		}
340 340
 
341 341
 
Please login to merge, or discard this patch.
includes/lib/class-gamajo-template-loader.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -76,15 +76,15 @@  discard block
 block discarded – undo
76 76
 	 *
77 77
 	 * @return string
78 78
 	 */
79
-	public function get_template_part( $slug, $name = null, $load = true ) {
79
+	public function get_template_part($slug, $name = null, $load = true) {
80 80
 		// Execute code for this part
81
-		do_action( 'get_template_part_' . $slug, $slug, $name );
81
+		do_action('get_template_part_'.$slug, $slug, $name);
82 82
 
83 83
 		// Get files names of templates, for given slug and name.
84
-		$templates = $this->get_template_file_names( $slug, $name );
84
+		$templates = $this->get_template_file_names($slug, $name);
85 85
 
86 86
 		// Return the part that is found
87
-		return $this->locate_template( $templates, $load, false );
87
+		return $this->locate_template($templates, $load, false);
88 88
 	}
89 89
 
90 90
 	/**
@@ -97,12 +97,12 @@  discard block
 block discarded – undo
97 97
 	 *
98 98
 	 * @return array
99 99
 	 */
100
-	protected function get_template_file_names( $slug, $name ) {
100
+	protected function get_template_file_names($slug, $name) {
101 101
 		$templates = array();
102
-		if ( isset( $name ) ) {
103
-			$templates[] = $slug . '-' . $name . '.php';
102
+		if (isset($name)) {
103
+			$templates[] = $slug.'-'.$name.'.php';
104 104
 		}
105
-		$templates[] = $slug . '.php';
105
+		$templates[] = $slug.'.php';
106 106
 
107 107
 		/**
108 108
 		 * Allow template choices to be filtered.
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 		 * @param string $slug Template slug.
117 117
 		 * @param string $name Template name.
118 118
 		 */
119
-		return apply_filters( $this->filter_prefix . '_get_template_part', $templates, $slug, $name );
119
+		return apply_filters($this->filter_prefix.'_get_template_part', $templates, $slug, $name);
120 120
 	}
121 121
 
122 122
 	/**
@@ -137,30 +137,30 @@  discard block
 block discarded – undo
137 137
 	 *
138 138
 	 * @return string The template filename if one is located.
139 139
 	 */
140
-	public function locate_template( $template_names, $load = false, $require_once = true ) {
140
+	public function locate_template($template_names, $load = false, $require_once = true) {
141 141
 		// No file found yet
142 142
 		$located = false;
143 143
 
144 144
 		// Remove empty entries
145
-		$template_names = array_filter( (array) $template_names );
145
+		$template_names = array_filter((array)$template_names);
146 146
 		$template_paths = $this->get_template_paths();
147 147
 
148 148
 		// Try to find a template file
149
-		foreach ( $template_names as $template_name ) {
149
+		foreach ($template_names as $template_name) {
150 150
 			// Trim off any slashes from the template name
151
-			$template_name = ltrim( $template_name, '/' );
151
+			$template_name = ltrim($template_name, '/');
152 152
 
153 153
 			// Try locating this template file by looping through the template paths
154
-			foreach ( $template_paths as $template_path ) {
155
-				if ( file_exists( $template_path . $template_name ) ) {
156
-					$located = $template_path . $template_name;
154
+			foreach ($template_paths as $template_path) {
155
+				if (file_exists($template_path.$template_name)) {
156
+					$located = $template_path.$template_name;
157 157
 					break 2;
158 158
 				}
159 159
 			}
160 160
 		}
161 161
 
162
-		if ( $load && $located ) {
163
-			load_template( $located, $require_once );
162
+		if ($load && $located) {
163
+			load_template($located, $require_once);
164 164
 		}
165 165
 
166 166
 		return $located;
@@ -178,16 +178,16 @@  discard block
 block discarded – undo
178 178
 	 * @return mixed|void
179 179
 	 */
180 180
 	protected function get_template_paths() {
181
-		$theme_directory = trailingslashit( $this->theme_template_directory );
181
+		$theme_directory = trailingslashit($this->theme_template_directory);
182 182
 
183 183
 		$file_paths = array(
184
-			10  => trailingslashit( get_template_directory() ) . $theme_directory,
184
+			10  => trailingslashit(get_template_directory()).$theme_directory,
185 185
 			100 => $this->get_templates_dir()
186 186
 		);
187 187
 
188 188
 		// Only add this conditionally, so non-child themes don't redundantly check active theme twice.
189
-		if ( is_child_theme() ) {
190
-			$file_paths[1] = trailingslashit( get_stylesheet_directory() ) . $theme_directory;
189
+		if (is_child_theme()) {
190
+			$file_paths[1] = trailingslashit(get_stylesheet_directory()).$theme_directory;
191 191
 		}
192 192
 
193 193
 		/**
@@ -197,12 +197,12 @@  discard block
 block discarded – undo
197 197
 		 *
198 198
 		 * @param array $var Default is directory in child theme at index 1, parent theme at 10, and plugin at 100.
199 199
 		 */
200
-		$file_paths = apply_filters( $this->filter_prefix . '_template_paths', $file_paths );
200
+		$file_paths = apply_filters($this->filter_prefix.'_template_paths', $file_paths);
201 201
 
202 202
 		// sort the file paths based on priority
203
-		ksort( $file_paths, SORT_NUMERIC );
203
+		ksort($file_paths, SORT_NUMERIC);
204 204
 
205
-		return array_map( 'trailingslashit', $file_paths );
205
+		return array_map('trailingslashit', $file_paths);
206 206
 	}
207 207
 
208 208
 	/**
@@ -215,6 +215,6 @@  discard block
 block discarded – undo
215 215
 	 * @return string
216 216
 	 */
217 217
 	protected function get_templates_dir() {
218
-		return trailingslashit( $this->plugin_directory ) . $this->plugin_template_directory;
218
+		return trailingslashit($this->plugin_directory).$this->plugin_template_directory;
219 219
 	}
220 220
 }
Please login to merge, or discard this patch.
includes/lib/xml-parsers/parsers.php 1 patch
Spacing   +299 added lines, -299 removed lines patch added patch discarded remove patch
@@ -10,42 +10,42 @@  discard block
 block discarded – undo
10 10
  * WordPress Importer class for managing parsing of WXR files.
11 11
  */
12 12
 class WXR_Parser {
13
-	function parse( $file ) {
13
+	function parse($file) {
14 14
 		// Attempt to use proper XML parsers first
15
-		if ( extension_loaded( 'simplexml' ) ) {
15
+		if (extension_loaded('simplexml')) {
16 16
 			$parser = new WXR_Parser_SimpleXML;
17
-			$result = $parser->parse( $file );
17
+			$result = $parser->parse($file);
18 18
 
19 19
 			// If SimpleXML succeeds or this is an invalid WXR file then return the results
20
-			if ( ! is_wp_error( $result ) || 'SimpleXML_parse_error' != $result->get_error_code() )
20
+			if (!is_wp_error($result) || 'SimpleXML_parse_error' != $result->get_error_code())
21 21
 				return $result;
22
-		} else if ( extension_loaded( 'xml' ) ) {
22
+		} else if (extension_loaded('xml')) {
23 23
 			$parser = new WXR_Parser_XML;
24
-			$result = $parser->parse( $file );
24
+			$result = $parser->parse($file);
25 25
 
26 26
 			// If XMLParser succeeds or this is an invalid WXR file then return the results
27
-			if ( ! is_wp_error( $result ) || 'XML_parse_error' != $result->get_error_code() )
27
+			if (!is_wp_error($result) || 'XML_parse_error' != $result->get_error_code())
28 28
 				return $result;
29 29
 		}
30 30
 
31 31
 		// We have a malformed XML file, so display the error and fallthrough to regex
32
-		if ( isset($result) && defined('IMPORT_DEBUG') && IMPORT_DEBUG ) {
32
+		if (isset($result) && defined('IMPORT_DEBUG') && IMPORT_DEBUG) {
33 33
 			echo '<pre>';
34
-			if ( 'SimpleXML_parse_error' == $result->get_error_code() ) {
35
-				foreach  ( $result->get_error_data() as $error )
36
-					echo $error->line . ':' . $error->column . ' ' . esc_html( $error->message ) . "\n";
37
-			} else if ( 'XML_parse_error' == $result->get_error_code() ) {
34
+			if ('SimpleXML_parse_error' == $result->get_error_code()) {
35
+				foreach ($result->get_error_data() as $error)
36
+					echo $error->line.':'.$error->column.' '.esc_html($error->message)."\n";
37
+			} else if ('XML_parse_error' == $result->get_error_code()) {
38 38
 				$error = $result->get_error_data();
39
-				echo $error[0] . ':' . $error[1] . ' ' . esc_html( $error[2] );
39
+				echo $error[0].':'.$error[1].' '.esc_html($error[2]);
40 40
 			}
41 41
 			echo '</pre>';
42
-			echo '<p><strong>' . __( 'There was an error when reading this WXR file', 'wordpress-importer' ) . '</strong><br />';
43
-			echo __( 'Details are shown above. The importer will now try again with a different parser...', 'wordpress-importer' ) . '</p>';
42
+			echo '<p><strong>'.__('There was an error when reading this WXR file', 'wordpress-importer').'</strong><br />';
43
+			echo __('Details are shown above. The importer will now try again with a different parser...', 'wordpress-importer').'</p>';
44 44
 		}
45 45
 
46 46
 		// use regular expressions if nothing else available or this is bad XML
47 47
 		$parser = new WXR_Parser_Regex;
48
-		return $parser->parse( $file );
48
+		return $parser->parse($file);
49 49
 	}
50 50
 }
51 51
 
@@ -53,171 +53,171 @@  discard block
 block discarded – undo
53 53
  * WXR Parser that makes use of the SimpleXML PHP extension.
54 54
  */
55 55
 class WXR_Parser_SimpleXML {
56
-	function parse( $file ) {
56
+	function parse($file) {
57 57
 		$authors = $posts = $categories = $tags = $terms = array();
58 58
 
59 59
 		$internal_errors = libxml_use_internal_errors(true);
60 60
 
61 61
 		$dom = new DOMDocument;
62 62
 		$old_value = null;
63
-		if ( function_exists( 'libxml_disable_entity_loader' ) ) {
64
-			$old_value = libxml_disable_entity_loader( true );
63
+		if (function_exists('libxml_disable_entity_loader')) {
64
+			$old_value = libxml_disable_entity_loader(true);
65 65
 		}
66
-		$success = $dom->loadXML( file_get_contents( $file ) );
67
-		if ( ! is_null( $old_value ) ) {
68
-			libxml_disable_entity_loader( $old_value );
66
+		$success = $dom->loadXML(file_get_contents($file));
67
+		if (!is_null($old_value)) {
68
+			libxml_disable_entity_loader($old_value);
69 69
 		}
70 70
 
71
-		if ( ! $success || isset( $dom->doctype ) ) {
72
-			return new WP_Error( 'SimpleXML_parse_error', __( 'There was an error when reading this WXR file', 'wordpress-importer' ), libxml_get_errors() );
71
+		if (!$success || isset($dom->doctype)) {
72
+			return new WP_Error('SimpleXML_parse_error', __('There was an error when reading this WXR file', 'wordpress-importer'), libxml_get_errors());
73 73
 		}
74 74
 
75
-		$xml = simplexml_import_dom( $dom );
76
-		unset( $dom );
75
+		$xml = simplexml_import_dom($dom);
76
+		unset($dom);
77 77
 
78 78
 		// halt if loading produces an error
79
-		if ( ! $xml )
80
-			return new WP_Error( 'SimpleXML_parse_error', __( 'There was an error when reading this WXR file', 'wordpress-importer' ), libxml_get_errors() );
79
+		if (!$xml)
80
+			return new WP_Error('SimpleXML_parse_error', __('There was an error when reading this WXR file', 'wordpress-importer'), libxml_get_errors());
81 81
 
82 82
 		$wxr_version = $xml->xpath('/rss/channel/wp:wxr_version');
83
-		if ( ! $wxr_version )
84
-			return new WP_Error( 'WXR_parse_error', __( 'This does not appear to be a WXR file, missing/invalid WXR version number', 'wordpress-importer' ) );
83
+		if (!$wxr_version)
84
+			return new WP_Error('WXR_parse_error', __('This does not appear to be a WXR file, missing/invalid WXR version number', 'wordpress-importer'));
85 85
 
86
-		$wxr_version = (string) trim( $wxr_version[0] );
86
+		$wxr_version = (string)trim($wxr_version[0]);
87 87
 		// confirm that we are dealing with the correct file format
88
-		if ( ! preg_match( '/^\d+\.\d+$/', $wxr_version ) )
89
-			return new WP_Error( 'WXR_parse_error', __( 'This does not appear to be a WXR file, missing/invalid WXR version number', 'wordpress-importer' ) );
88
+		if (!preg_match('/^\d+\.\d+$/', $wxr_version))
89
+			return new WP_Error('WXR_parse_error', __('This does not appear to be a WXR file, missing/invalid WXR version number', 'wordpress-importer'));
90 90
 
91 91
 		$base_url = $xml->xpath('/rss/channel/wp:base_site_url');
92
-		$base_url = isset($base_url[0]) ? (string) trim( $base_url[0] ) : ''; // Modified by GravityView: Check if base_url exists; the GV import files may exclude them.
92
+		$base_url = isset($base_url[0]) ? (string)trim($base_url[0]) : ''; // Modified by GravityView: Check if base_url exists; the GV import files may exclude them.
93 93
 
94 94
 		$namespaces = $xml->getDocNamespaces();
95
-		if ( ! isset( $namespaces['wp'] ) )
95
+		if (!isset($namespaces['wp']))
96 96
 			$namespaces['wp'] = 'http://wordpress.org/export/1.1/';
97
-		if ( ! isset( $namespaces['excerpt'] ) )
97
+		if (!isset($namespaces['excerpt']))
98 98
 			$namespaces['excerpt'] = 'http://wordpress.org/export/1.1/excerpt/';
99 99
 
100 100
 		// grab authors
101
-		foreach ( $xml->xpath('/rss/channel/wp:author') as $author_arr ) {
102
-			$a = $author_arr->children( $namespaces['wp'] );
103
-			$login = (string) $a->author_login;
101
+		foreach ($xml->xpath('/rss/channel/wp:author') as $author_arr) {
102
+			$a = $author_arr->children($namespaces['wp']);
103
+			$login = (string)$a->author_login;
104 104
 			$authors[$login] = array(
105
-				'author_id' => (int) $a->author_id,
105
+				'author_id' => (int)$a->author_id,
106 106
 				'author_login' => $login,
107
-				'author_email' => (string) $a->author_email,
108
-				'author_display_name' => (string) $a->author_display_name,
109
-				'author_first_name' => (string) $a->author_first_name,
110
-				'author_last_name' => (string) $a->author_last_name
107
+				'author_email' => (string)$a->author_email,
108
+				'author_display_name' => (string)$a->author_display_name,
109
+				'author_first_name' => (string)$a->author_first_name,
110
+				'author_last_name' => (string)$a->author_last_name
111 111
 			);
112 112
 		}
113 113
 
114 114
 		// grab cats, tags and terms
115
-		foreach ( $xml->xpath('/rss/channel/wp:category') as $term_arr ) {
116
-			$t = $term_arr->children( $namespaces['wp'] );
115
+		foreach ($xml->xpath('/rss/channel/wp:category') as $term_arr) {
116
+			$t = $term_arr->children($namespaces['wp']);
117 117
 			$categories[] = array(
118
-				'term_id' => (int) $t->term_id,
119
-				'category_nicename' => (string) $t->category_nicename,
120
-				'category_parent' => (string) $t->category_parent,
121
-				'cat_name' => (string) $t->cat_name,
122
-				'category_description' => (string) $t->category_description
118
+				'term_id' => (int)$t->term_id,
119
+				'category_nicename' => (string)$t->category_nicename,
120
+				'category_parent' => (string)$t->category_parent,
121
+				'cat_name' => (string)$t->cat_name,
122
+				'category_description' => (string)$t->category_description
123 123
 			);
124 124
 		}
125 125
 
126
-		foreach ( $xml->xpath('/rss/channel/wp:tag') as $term_arr ) {
127
-			$t = $term_arr->children( $namespaces['wp'] );
126
+		foreach ($xml->xpath('/rss/channel/wp:tag') as $term_arr) {
127
+			$t = $term_arr->children($namespaces['wp']);
128 128
 			$tags[] = array(
129
-				'term_id' => (int) $t->term_id,
130
-				'tag_slug' => (string) $t->tag_slug,
131
-				'tag_name' => (string) $t->tag_name,
132
-				'tag_description' => (string) $t->tag_description
129
+				'term_id' => (int)$t->term_id,
130
+				'tag_slug' => (string)$t->tag_slug,
131
+				'tag_name' => (string)$t->tag_name,
132
+				'tag_description' => (string)$t->tag_description
133 133
 			);
134 134
 		}
135 135
 
136
-		foreach ( $xml->xpath('/rss/channel/wp:term') as $term_arr ) {
137
-			$t = $term_arr->children( $namespaces['wp'] );
136
+		foreach ($xml->xpath('/rss/channel/wp:term') as $term_arr) {
137
+			$t = $term_arr->children($namespaces['wp']);
138 138
 			$terms[] = array(
139
-				'term_id' => (int) $t->term_id,
140
-				'term_taxonomy' => (string) $t->term_taxonomy,
141
-				'slug' => (string) $t->term_slug,
142
-				'term_parent' => (string) $t->term_parent,
143
-				'term_name' => (string) $t->term_name,
144
-				'term_description' => (string) $t->term_description
139
+				'term_id' => (int)$t->term_id,
140
+				'term_taxonomy' => (string)$t->term_taxonomy,
141
+				'slug' => (string)$t->term_slug,
142
+				'term_parent' => (string)$t->term_parent,
143
+				'term_name' => (string)$t->term_name,
144
+				'term_description' => (string)$t->term_description
145 145
 			);
146 146
 		}
147 147
 
148 148
 		// grab posts
149
-		foreach ( $xml->channel->item as $item ) {
149
+		foreach ($xml->channel->item as $item) {
150 150
 			$post = array(
151
-				'post_title' => (string) $item->title,
152
-				'guid' => (string) $item->guid,
151
+				'post_title' => (string)$item->title,
152
+				'guid' => (string)$item->guid,
153 153
 			);
154 154
 
155
-			$dc = $item->children( 'http://purl.org/dc/elements/1.1/' );
156
-			$post['post_author'] = (string) $dc->creator;
157
-
158
-			$content = $item->children( 'http://purl.org/rss/1.0/modules/content/' );
159
-			$excerpt = $item->children( $namespaces['excerpt'] );
160
-			$post['post_content'] = (string) $content->encoded;
161
-			$post['post_excerpt'] = (string) $excerpt->encoded;
162
-
163
-			$wp = $item->children( $namespaces['wp'] );
164
-			$post['post_id'] = (int) $wp->post_id;
165
-			$post['post_date'] = (string) $wp->post_date;
166
-			$post['post_date_gmt'] = (string) $wp->post_date_gmt;
167
-			$post['comment_status'] = (string) $wp->comment_status;
168
-			$post['ping_status'] = (string) $wp->ping_status;
169
-			$post['post_name'] = (string) $wp->post_name;
170
-			$post['status'] = (string) $wp->status;
171
-			$post['post_parent'] = (int) $wp->post_parent;
172
-			$post['menu_order'] = (int) $wp->menu_order;
173
-			$post['post_type'] = (string) $wp->post_type;
174
-			$post['post_password'] = (string) $wp->post_password;
175
-			$post['is_sticky'] = (int) $wp->is_sticky;
176
-
177
-			if ( isset($wp->attachment_url) )
178
-				$post['attachment_url'] = (string) $wp->attachment_url;
179
-
180
-			foreach ( $item->category as $c ) {
155
+			$dc = $item->children('http://purl.org/dc/elements/1.1/');
156
+			$post['post_author'] = (string)$dc->creator;
157
+
158
+			$content = $item->children('http://purl.org/rss/1.0/modules/content/');
159
+			$excerpt = $item->children($namespaces['excerpt']);
160
+			$post['post_content'] = (string)$content->encoded;
161
+			$post['post_excerpt'] = (string)$excerpt->encoded;
162
+
163
+			$wp = $item->children($namespaces['wp']);
164
+			$post['post_id'] = (int)$wp->post_id;
165
+			$post['post_date'] = (string)$wp->post_date;
166
+			$post['post_date_gmt'] = (string)$wp->post_date_gmt;
167
+			$post['comment_status'] = (string)$wp->comment_status;
168
+			$post['ping_status'] = (string)$wp->ping_status;
169
+			$post['post_name'] = (string)$wp->post_name;
170
+			$post['status'] = (string)$wp->status;
171
+			$post['post_parent'] = (int)$wp->post_parent;
172
+			$post['menu_order'] = (int)$wp->menu_order;
173
+			$post['post_type'] = (string)$wp->post_type;
174
+			$post['post_password'] = (string)$wp->post_password;
175
+			$post['is_sticky'] = (int)$wp->is_sticky;
176
+
177
+			if (isset($wp->attachment_url))
178
+				$post['attachment_url'] = (string)$wp->attachment_url;
179
+
180
+			foreach ($item->category as $c) {
181 181
 				$att = $c->attributes();
182
-				if ( isset( $att['nicename'] ) )
182
+				if (isset($att['nicename']))
183 183
 					$post['terms'][] = array(
184
-						'name' => (string) $c,
185
-						'slug' => (string) $att['nicename'],
186
-						'domain' => (string) $att['domain']
184
+						'name' => (string)$c,
185
+						'slug' => (string)$att['nicename'],
186
+						'domain' => (string)$att['domain']
187 187
 					);
188 188
 			}
189 189
 
190
-			foreach ( $wp->postmeta as $meta ) {
190
+			foreach ($wp->postmeta as $meta) {
191 191
 				$post['postmeta'][] = array(
192
-					'key' => (string) $meta->meta_key,
193
-					'value' => (string) $meta->meta_value
192
+					'key' => (string)$meta->meta_key,
193
+					'value' => (string)$meta->meta_value
194 194
 				);
195 195
 			}
196 196
 
197
-			foreach ( $wp->comment as $comment ) {
197
+			foreach ($wp->comment as $comment) {
198 198
 				$meta = array();
199
-				if ( isset( $comment->commentmeta ) ) {
200
-					foreach ( $comment->commentmeta as $m ) {
199
+				if (isset($comment->commentmeta)) {
200
+					foreach ($comment->commentmeta as $m) {
201 201
 						$meta[] = array(
202
-							'key' => (string) $m->meta_key,
203
-							'value' => (string) $m->meta_value
202
+							'key' => (string)$m->meta_key,
203
+							'value' => (string)$m->meta_value
204 204
 						);
205 205
 					}
206 206
 				}
207 207
 
208 208
 				$post['comments'][] = array(
209
-					'comment_id' => (int) $comment->comment_id,
210
-					'comment_author' => (string) $comment->comment_author,
211
-					'comment_author_email' => (string) $comment->comment_author_email,
212
-					'comment_author_IP' => (string) $comment->comment_author_IP,
213
-					'comment_author_url' => (string) $comment->comment_author_url,
214
-					'comment_date' => (string) $comment->comment_date,
215
-					'comment_date_gmt' => (string) $comment->comment_date_gmt,
216
-					'comment_content' => (string) $comment->comment_content,
217
-					'comment_approved' => (string) $comment->comment_approved,
218
-					'comment_type' => (string) $comment->comment_type,
219
-					'comment_parent' => (string) $comment->comment_parent,
220
-					'comment_user_id' => (int) $comment->comment_user_id,
209
+					'comment_id' => (int)$comment->comment_id,
210
+					'comment_author' => (string)$comment->comment_author,
211
+					'comment_author_email' => (string)$comment->comment_author_email,
212
+					'comment_author_IP' => (string)$comment->comment_author_IP,
213
+					'comment_author_url' => (string)$comment->comment_author_url,
214
+					'comment_date' => (string)$comment->comment_date,
215
+					'comment_date_gmt' => (string)$comment->comment_date_gmt,
216
+					'comment_content' => (string)$comment->comment_content,
217
+					'comment_approved' => (string)$comment->comment_approved,
218
+					'comment_type' => (string)$comment->comment_type,
219
+					'comment_parent' => (string)$comment->comment_parent,
220
+					'comment_user_id' => (int)$comment->comment_user_id,
221 221
 					'commentmeta' => $meta,
222 222
 				);
223 223
 			}
@@ -251,32 +251,32 @@  discard block
 block discarded – undo
251 251
 	);
252 252
 	var $wp_sub_tags = array(
253 253
 		'wp:comment_id', 'wp:comment_author', 'wp:comment_author_email', 'wp:comment_author_url',
254
-		'wp:comment_author_IP',	'wp:comment_date', 'wp:comment_date_gmt', 'wp:comment_content',
254
+		'wp:comment_author_IP', 'wp:comment_date', 'wp:comment_date_gmt', 'wp:comment_content',
255 255
 		'wp:comment_approved', 'wp:comment_type', 'wp:comment_parent', 'wp:comment_user_id',
256 256
 	);
257 257
 
258
-	function parse( $file ) {
258
+	function parse($file) {
259 259
 		$this->wxr_version = $this->in_post = $this->cdata = $this->data = $this->sub_data = $this->in_tag = $this->in_sub_tag = false;
260 260
 		$this->authors = $this->posts = $this->term = $this->category = $this->tag = array();
261 261
 
262
-		$xml = xml_parser_create( 'UTF-8' );
263
-		xml_parser_set_option( $xml, XML_OPTION_SKIP_WHITE, 1 );
264
-		xml_parser_set_option( $xml, XML_OPTION_CASE_FOLDING, 0 );
265
-		xml_set_object( $xml, $this );
266
-		xml_set_character_data_handler( $xml, 'cdata' );
267
-		xml_set_element_handler( $xml, 'tag_open', 'tag_close' );
268
-
269
-		if ( ! xml_parse( $xml, file_get_contents( $file ), true ) ) {
270
-			$current_line = xml_get_current_line_number( $xml );
271
-			$current_column = xml_get_current_column_number( $xml );
272
-			$error_code = xml_get_error_code( $xml );
273
-			$error_string = xml_error_string( $error_code );
274
-			return new WP_Error( 'XML_parse_error', 'There was an error when reading this WXR file', array( $current_line, $current_column, $error_string ) );
262
+		$xml = xml_parser_create('UTF-8');
263
+		xml_parser_set_option($xml, XML_OPTION_SKIP_WHITE, 1);
264
+		xml_parser_set_option($xml, XML_OPTION_CASE_FOLDING, 0);
265
+		xml_set_object($xml, $this);
266
+		xml_set_character_data_handler($xml, 'cdata');
267
+		xml_set_element_handler($xml, 'tag_open', 'tag_close');
268
+
269
+		if (!xml_parse($xml, file_get_contents($file), true)) {
270
+			$current_line = xml_get_current_line_number($xml);
271
+			$current_column = xml_get_current_column_number($xml);
272
+			$error_code = xml_get_error_code($xml);
273
+			$error_string = xml_error_string($error_code);
274
+			return new WP_Error('XML_parse_error', 'There was an error when reading this WXR file', array($current_line, $current_column, $error_string));
275 275
 		}
276
-		xml_parser_free( $xml );
276
+		xml_parser_free($xml);
277 277
 
278
-		if ( ! preg_match( '/^\d+\.\d+$/', $this->wxr_version ) )
279
-			return new WP_Error( 'WXR_parse_error', __( 'This does not appear to be a WXR file, missing/invalid WXR version number', 'wordpress-importer' ) );
278
+		if (!preg_match('/^\d+\.\d+$/', $this->wxr_version))
279
+			return new WP_Error('WXR_parse_error', __('This does not appear to be a WXR file, missing/invalid WXR version number', 'wordpress-importer'));
280 280
 
281 281
 		return array(
282 282
 			'authors' => $this->authors,
@@ -289,26 +289,26 @@  discard block
 block discarded – undo
289 289
 		);
290 290
 	}
291 291
 
292
-	function tag_open( $parse, $tag, $attr ) {
293
-		if ( in_array( $tag, $this->wp_tags ) ) {
294
-			$this->in_tag = substr( $tag, 3 );
292
+	function tag_open($parse, $tag, $attr) {
293
+		if (in_array($tag, $this->wp_tags)) {
294
+			$this->in_tag = substr($tag, 3);
295 295
 			return;
296 296
 		}
297 297
 
298
-		if ( in_array( $tag, $this->wp_sub_tags ) ) {
299
-			$this->in_sub_tag = substr( $tag, 3 );
298
+		if (in_array($tag, $this->wp_sub_tags)) {
299
+			$this->in_sub_tag = substr($tag, 3);
300 300
 			return;
301 301
 		}
302 302
 
303
-		switch ( $tag ) {
303
+		switch ($tag) {
304 304
 			case 'category':
305
-				if ( isset($attr['domain'], $attr['nicename']) ) {
305
+				if (isset($attr['domain'], $attr['nicename'])) {
306 306
 					$this->sub_data['domain'] = $attr['domain'];
307 307
 					$this->sub_data['slug'] = $attr['nicename'];
308 308
 				}
309 309
 				break;
310 310
 			case 'item': $this->in_post = true;
311
-			case 'title': if ( $this->in_post ) $this->in_tag = 'post_title'; break;
311
+			case 'title': if ($this->in_post) $this->in_tag = 'post_title'; break;
312 312
 			case 'guid': $this->in_tag = 'guid'; break;
313 313
 			case 'dc:creator': $this->in_tag = 'post_author'; break;
314 314
 			case 'content:encoded': $this->in_tag = 'post_content'; break;
@@ -320,18 +320,18 @@  discard block
 block discarded – undo
320 320
 		}
321 321
 	}
322 322
 
323
-	function cdata( $parser, $cdata ) {
324
-		if ( ! trim( $cdata ) )
323
+	function cdata($parser, $cdata) {
324
+		if (!trim($cdata))
325 325
 			return;
326 326
 
327
-		$this->cdata .= trim( $cdata );
327
+		$this->cdata .= trim($cdata);
328 328
 	}
329 329
 
330
-	function tag_close( $parser, $tag ) {
331
-		switch ( $tag ) {
330
+	function tag_close($parser, $tag) {
331
+		switch ($tag) {
332 332
 			case 'wp:comment':
333
-				unset( $this->sub_data['key'], $this->sub_data['value'] ); // remove meta sub_data
334
-				if ( ! empty( $this->sub_data ) )
333
+				unset($this->sub_data['key'], $this->sub_data['value']); // remove meta sub_data
334
+				if (!empty($this->sub_data))
335 335
 					$this->data['comments'][] = $this->sub_data;
336 336
 				$this->sub_data = false;
337 337
 				break;
@@ -342,14 +342,14 @@  discard block
 block discarded – undo
342 342
 				);
343 343
 				break;
344 344
 			case 'category':
345
-				if ( ! empty( $this->sub_data ) ) {
345
+				if (!empty($this->sub_data)) {
346 346
 					$this->sub_data['name'] = $this->cdata;
347 347
 					$this->data['terms'][] = $this->sub_data;
348 348
 				}
349 349
 				$this->sub_data = false;
350 350
 				break;
351 351
 			case 'wp:postmeta':
352
-				if ( ! empty( $this->sub_data ) )
352
+				if (!empty($this->sub_data))
353 353
 					$this->data['postmeta'][] = $this->sub_data;
354 354
 				$this->sub_data = false;
355 355
 				break;
@@ -360,12 +360,12 @@  discard block
 block discarded – undo
360 360
 			case 'wp:category':
361 361
 			case 'wp:tag':
362 362
 			case 'wp:term':
363
-				$n = substr( $tag, 3 );
364
-				array_push( $this->$n, $this->data );
363
+				$n = substr($tag, 3);
364
+				array_push($this->$n, $this->data);
365 365
 				$this->data = false;
366 366
 				break;
367 367
 			case 'wp:author':
368
-				if ( ! empty($this->data['author_login']) )
368
+				if (!empty($this->data['author_login']))
369 369
 					$this->authors[$this->data['author_login']] = $this->data;
370 370
 				$this->data = false;
371 371
 				break;
@@ -377,11 +377,11 @@  discard block
 block discarded – undo
377 377
 				break;
378 378
 
379 379
 			default:
380
-				if ( $this->in_sub_tag ) {
381
-					$this->sub_data[$this->in_sub_tag] = ! empty( $this->cdata ) ? $this->cdata : '';
380
+				if ($this->in_sub_tag) {
381
+					$this->sub_data[$this->in_sub_tag] = !empty($this->cdata) ? $this->cdata : '';
382 382
 					$this->in_sub_tag = false;
383
-				} else if ( $this->in_tag ) {
384
-					$this->data[$this->in_tag] = ! empty( $this->cdata ) ? $this->cdata : '';
383
+				} else if ($this->in_tag) {
384
+					$this->data[$this->in_tag] = !empty($this->cdata) ? $this->cdata : '';
385 385
 					$this->in_tag = false;
386 386
 				}
387 387
 		}
@@ -407,66 +407,66 @@  discard block
 block discarded – undo
407 407
 	}*/
408 408
 
409 409
 	function __construct() {
410
-		$this->has_gzip = is_callable( 'gzopen' );
410
+		$this->has_gzip = is_callable('gzopen');
411 411
 	}
412 412
 
413
-	function parse( $file ) {
413
+	function parse($file) {
414 414
 		$wxr_version = $in_post = false;
415 415
 
416
-		$fp = $this->fopen( $file, 'r' );
417
-		if ( $fp ) {
418
-			while ( ! $this->feof( $fp ) ) {
419
-				$importline = rtrim( $this->fgets( $fp ) );
416
+		$fp = $this->fopen($file, 'r');
417
+		if ($fp) {
418
+			while (!$this->feof($fp)) {
419
+				$importline = rtrim($this->fgets($fp));
420 420
 
421
-				if ( ! $wxr_version && preg_match( '|<wp:wxr_version>(\d+\.\d+)</wp:wxr_version>|', $importline, $version ) )
421
+				if (!$wxr_version && preg_match('|<wp:wxr_version>(\d+\.\d+)</wp:wxr_version>|', $importline, $version))
422 422
 					$wxr_version = $version[1];
423 423
 
424
-				if ( false !== strpos( $importline, '<wp:base_site_url>' ) ) {
425
-					preg_match( '|<wp:base_site_url>(.*?)</wp:base_site_url>|is', $importline, $url );
424
+				if (false !== strpos($importline, '<wp:base_site_url>')) {
425
+					preg_match('|<wp:base_site_url>(.*?)</wp:base_site_url>|is', $importline, $url);
426 426
 					$this->base_url = $url[1];
427 427
 					continue;
428 428
 				}
429
-				if ( false !== strpos( $importline, '<wp:category>' ) ) {
430
-					preg_match( '|<wp:category>(.*?)</wp:category>|is', $importline, $category );
431
-					$this->categories[] = $this->process_category( $category[1] );
429
+				if (false !== strpos($importline, '<wp:category>')) {
430
+					preg_match('|<wp:category>(.*?)</wp:category>|is', $importline, $category);
431
+					$this->categories[] = $this->process_category($category[1]);
432 432
 					continue;
433 433
 				}
434
-				if ( false !== strpos( $importline, '<wp:tag>' ) ) {
435
-					preg_match( '|<wp:tag>(.*?)</wp:tag>|is', $importline, $tag );
436
-					$this->tags[] = $this->process_tag( $tag[1] );
434
+				if (false !== strpos($importline, '<wp:tag>')) {
435
+					preg_match('|<wp:tag>(.*?)</wp:tag>|is', $importline, $tag);
436
+					$this->tags[] = $this->process_tag($tag[1]);
437 437
 					continue;
438 438
 				}
439
-				if ( false !== strpos( $importline, '<wp:term>' ) ) {
440
-					preg_match( '|<wp:term>(.*?)</wp:term>|is', $importline, $term );
441
-					$this->terms[] = $this->process_term( $term[1] );
439
+				if (false !== strpos($importline, '<wp:term>')) {
440
+					preg_match('|<wp:term>(.*?)</wp:term>|is', $importline, $term);
441
+					$this->terms[] = $this->process_term($term[1]);
442 442
 					continue;
443 443
 				}
444
-				if ( false !== strpos( $importline, '<wp:author>' ) ) {
445
-					preg_match( '|<wp:author>(.*?)</wp:author>|is', $importline, $author );
446
-					$a = $this->process_author( $author[1] );
444
+				if (false !== strpos($importline, '<wp:author>')) {
445
+					preg_match('|<wp:author>(.*?)</wp:author>|is', $importline, $author);
446
+					$a = $this->process_author($author[1]);
447 447
 					$this->authors[$a['author_login']] = $a;
448 448
 					continue;
449 449
 				}
450
-				if ( false !== strpos( $importline, '<item>' ) ) {
450
+				if (false !== strpos($importline, '<item>')) {
451 451
 					$post = '';
452 452
 					$in_post = true;
453 453
 					continue;
454 454
 				}
455
-				if ( false !== strpos( $importline, '</item>' ) ) {
455
+				if (false !== strpos($importline, '</item>')) {
456 456
 					$in_post = false;
457
-					$this->posts[] = $this->process_post( $post );
457
+					$this->posts[] = $this->process_post($post);
458 458
 					continue;
459 459
 				}
460
-				if ( $in_post ) {
461
-					$post .= $importline . "\n";
460
+				if ($in_post) {
461
+					$post .= $importline."\n";
462 462
 				}
463 463
 			}
464 464
 
465 465
 			$this->fclose($fp);
466 466
 		}
467 467
 
468
-		if ( ! $wxr_version )
469
-			return new WP_Error( 'WXR_parse_error', __( 'This does not appear to be a WXR file, missing/invalid WXR version number', 'wordpress-importer' ) );
468
+		if (!$wxr_version)
469
+			return new WP_Error('WXR_parse_error', __('This does not appear to be a WXR file, missing/invalid WXR version number', 'wordpress-importer'));
470 470
 
471 471
 		return array(
472 472
 			'authors' => $this->authors,
@@ -479,17 +479,17 @@  discard block
 block discarded – undo
479 479
 		);
480 480
 	}
481 481
 
482
-	function get_tag( $string, $tag ) {
483
-		preg_match( "|<$tag.*?>(.*?)</$tag>|is", $string, $return );
484
-		if ( isset( $return[1] ) ) {
485
-			if ( substr( $return[1], 0, 9 ) == '<![CDATA[' ) {
486
-				if ( strpos( $return[1], ']]]]><![CDATA[>' ) !== false ) {
487
-					preg_match_all( '|<!\[CDATA\[(.*?)\]\]>|s', $return[1], $matches );
482
+	function get_tag($string, $tag) {
483
+		preg_match("|<$tag.*?>(.*?)</$tag>|is", $string, $return);
484
+		if (isset($return[1])) {
485
+			if (substr($return[1], 0, 9) == '<![CDATA[') {
486
+				if (strpos($return[1], ']]]]><![CDATA[>') !== false) {
487
+					preg_match_all('|<!\[CDATA\[(.*?)\]\]>|s', $return[1], $matches);
488 488
 					$return = '';
489
-					foreach( $matches[1] as $match )
489
+					foreach ($matches[1] as $match)
490 490
 						$return .= $match;
491 491
 				} else {
492
-					$return = preg_replace( '|^<!\[CDATA\[(.*)\]\]>$|s', '$1', $return[1] );
492
+					$return = preg_replace('|^<!\[CDATA\[(.*)\]\]>$|s', '$1', $return[1]);
493 493
 				}
494 494
 			} else {
495 495
 				$return = $return[1];
@@ -500,166 +500,166 @@  discard block
 block discarded – undo
500 500
 		return $return;
501 501
 	}
502 502
 
503
-	function process_category( $c ) {
503
+	function process_category($c) {
504 504
 		return array(
505
-			'term_id' => $this->get_tag( $c, 'wp:term_id' ),
506
-			'cat_name' => $this->get_tag( $c, 'wp:cat_name' ),
507
-			'category_nicename'	=> $this->get_tag( $c, 'wp:category_nicename' ),
508
-			'category_parent' => $this->get_tag( $c, 'wp:category_parent' ),
509
-			'category_description' => $this->get_tag( $c, 'wp:category_description' ),
505
+			'term_id' => $this->get_tag($c, 'wp:term_id'),
506
+			'cat_name' => $this->get_tag($c, 'wp:cat_name'),
507
+			'category_nicename'	=> $this->get_tag($c, 'wp:category_nicename'),
508
+			'category_parent' => $this->get_tag($c, 'wp:category_parent'),
509
+			'category_description' => $this->get_tag($c, 'wp:category_description'),
510 510
 		);
511 511
 	}
512 512
 
513
-	function process_tag( $t ) {
513
+	function process_tag($t) {
514 514
 		return array(
515
-			'term_id' => $this->get_tag( $t, 'wp:term_id' ),
516
-			'tag_name' => $this->get_tag( $t, 'wp:tag_name' ),
517
-			'tag_slug' => $this->get_tag( $t, 'wp:tag_slug' ),
518
-			'tag_description' => $this->get_tag( $t, 'wp:tag_description' ),
515
+			'term_id' => $this->get_tag($t, 'wp:term_id'),
516
+			'tag_name' => $this->get_tag($t, 'wp:tag_name'),
517
+			'tag_slug' => $this->get_tag($t, 'wp:tag_slug'),
518
+			'tag_description' => $this->get_tag($t, 'wp:tag_description'),
519 519
 		);
520 520
 	}
521 521
 
522
-	function process_term( $t ) {
522
+	function process_term($t) {
523 523
 		return array(
524
-			'term_id' => $this->get_tag( $t, 'wp:term_id' ),
525
-			'term_taxonomy' => $this->get_tag( $t, 'wp:term_taxonomy' ),
526
-			'slug' => $this->get_tag( $t, 'wp:term_slug' ),
527
-			'term_parent' => $this->get_tag( $t, 'wp:term_parent' ),
528
-			'term_name' => $this->get_tag( $t, 'wp:term_name' ),
529
-			'term_description' => $this->get_tag( $t, 'wp:term_description' ),
524
+			'term_id' => $this->get_tag($t, 'wp:term_id'),
525
+			'term_taxonomy' => $this->get_tag($t, 'wp:term_taxonomy'),
526
+			'slug' => $this->get_tag($t, 'wp:term_slug'),
527
+			'term_parent' => $this->get_tag($t, 'wp:term_parent'),
528
+			'term_name' => $this->get_tag($t, 'wp:term_name'),
529
+			'term_description' => $this->get_tag($t, 'wp:term_description'),
530 530
 		);
531 531
 	}
532 532
 
533
-	function process_author( $a ) {
533
+	function process_author($a) {
534 534
 		return array(
535
-			'author_id' => $this->get_tag( $a, 'wp:author_id' ),
536
-			'author_login' => $this->get_tag( $a, 'wp:author_login' ),
537
-			'author_email' => $this->get_tag( $a, 'wp:author_email' ),
538
-			'author_display_name' => $this->get_tag( $a, 'wp:author_display_name' ),
539
-			'author_first_name' => $this->get_tag( $a, 'wp:author_first_name' ),
540
-			'author_last_name' => $this->get_tag( $a, 'wp:author_last_name' ),
535
+			'author_id' => $this->get_tag($a, 'wp:author_id'),
536
+			'author_login' => $this->get_tag($a, 'wp:author_login'),
537
+			'author_email' => $this->get_tag($a, 'wp:author_email'),
538
+			'author_display_name' => $this->get_tag($a, 'wp:author_display_name'),
539
+			'author_first_name' => $this->get_tag($a, 'wp:author_first_name'),
540
+			'author_last_name' => $this->get_tag($a, 'wp:author_last_name'),
541 541
 		);
542 542
 	}
543 543
 
544
-	function process_post( $post ) {
545
-		$post_id        = $this->get_tag( $post, 'wp:post_id' );
546
-		$post_title     = $this->get_tag( $post, 'title' );
547
-		$post_date      = $this->get_tag( $post, 'wp:post_date' );
548
-		$post_date_gmt  = $this->get_tag( $post, 'wp:post_date_gmt' );
549
-		$comment_status = $this->get_tag( $post, 'wp:comment_status' );
550
-		$ping_status    = $this->get_tag( $post, 'wp:ping_status' );
551
-		$status         = $this->get_tag( $post, 'wp:status' );
552
-		$post_name      = $this->get_tag( $post, 'wp:post_name' );
553
-		$post_parent    = $this->get_tag( $post, 'wp:post_parent' );
554
-		$menu_order     = $this->get_tag( $post, 'wp:menu_order' );
555
-		$post_type      = $this->get_tag( $post, 'wp:post_type' );
556
-		$post_password  = $this->get_tag( $post, 'wp:post_password' );
557
-		$is_sticky      = $this->get_tag( $post, 'wp:is_sticky' );
558
-		$guid           = $this->get_tag( $post, 'guid' );
559
-		$post_author    = $this->get_tag( $post, 'dc:creator' );
560
-
561
-		$post_excerpt = $this->get_tag( $post, 'excerpt:encoded' );
562
-		$post_excerpt = preg_replace_callback( '|<(/?[A-Z]+)|', array( &$this, '_normalize_tag' ), $post_excerpt );
563
-		$post_excerpt = str_replace( '<br>', '<br />', $post_excerpt );
564
-		$post_excerpt = str_replace( '<hr>', '<hr />', $post_excerpt );
565
-
566
-		$post_content = $this->get_tag( $post, 'content:encoded' );
567
-		$post_content = preg_replace_callback( '|<(/?[A-Z]+)|', array( &$this, '_normalize_tag' ), $post_content );
568
-		$post_content = str_replace( '<br>', '<br />', $post_content );
569
-		$post_content = str_replace( '<hr>', '<hr />', $post_content );
570
-
571
-		$postdata = compact( 'post_id', 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_excerpt',
544
+	function process_post($post) {
545
+		$post_id        = $this->get_tag($post, 'wp:post_id');
546
+		$post_title     = $this->get_tag($post, 'title');
547
+		$post_date      = $this->get_tag($post, 'wp:post_date');
548
+		$post_date_gmt  = $this->get_tag($post, 'wp:post_date_gmt');
549
+		$comment_status = $this->get_tag($post, 'wp:comment_status');
550
+		$ping_status    = $this->get_tag($post, 'wp:ping_status');
551
+		$status         = $this->get_tag($post, 'wp:status');
552
+		$post_name      = $this->get_tag($post, 'wp:post_name');
553
+		$post_parent    = $this->get_tag($post, 'wp:post_parent');
554
+		$menu_order     = $this->get_tag($post, 'wp:menu_order');
555
+		$post_type      = $this->get_tag($post, 'wp:post_type');
556
+		$post_password  = $this->get_tag($post, 'wp:post_password');
557
+		$is_sticky      = $this->get_tag($post, 'wp:is_sticky');
558
+		$guid           = $this->get_tag($post, 'guid');
559
+		$post_author    = $this->get_tag($post, 'dc:creator');
560
+
561
+		$post_excerpt = $this->get_tag($post, 'excerpt:encoded');
562
+		$post_excerpt = preg_replace_callback('|<(/?[A-Z]+)|', array(&$this, '_normalize_tag'), $post_excerpt);
563
+		$post_excerpt = str_replace('<br>', '<br />', $post_excerpt);
564
+		$post_excerpt = str_replace('<hr>', '<hr />', $post_excerpt);
565
+
566
+		$post_content = $this->get_tag($post, 'content:encoded');
567
+		$post_content = preg_replace_callback('|<(/?[A-Z]+)|', array(&$this, '_normalize_tag'), $post_content);
568
+		$post_content = str_replace('<br>', '<br />', $post_content);
569
+		$post_content = str_replace('<hr>', '<hr />', $post_content);
570
+
571
+		$postdata = compact('post_id', 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_excerpt',
572 572
 			'post_title', 'status', 'post_name', 'comment_status', 'ping_status', 'guid', 'post_parent',
573 573
 			'menu_order', 'post_type', 'post_password', 'is_sticky'
574 574
 		);
575 575
 
576
-		$attachment_url = $this->get_tag( $post, 'wp:attachment_url' );
577
-		if ( $attachment_url )
576
+		$attachment_url = $this->get_tag($post, 'wp:attachment_url');
577
+		if ($attachment_url)
578 578
 			$postdata['attachment_url'] = $attachment_url;
579 579
 
580
-		preg_match_all( '|<category domain="([^"]+?)" nicename="([^"]+?)">(.+?)</category>|is', $post, $terms, PREG_SET_ORDER );
581
-		foreach ( $terms as $t ) {
580
+		preg_match_all('|<category domain="([^"]+?)" nicename="([^"]+?)">(.+?)</category>|is', $post, $terms, PREG_SET_ORDER);
581
+		foreach ($terms as $t) {
582 582
 			$post_terms[] = array(
583 583
 				'slug' => $t[2],
584 584
 				'domain' => $t[1],
585
-				'name' => str_replace( array( '<![CDATA[', ']]>' ), '', $t[3] ),
585
+				'name' => str_replace(array('<![CDATA[', ']]>'), '', $t[3]),
586 586
 			);
587 587
 		}
588
-		if ( ! empty( $post_terms ) ) $postdata['terms'] = $post_terms;
588
+		if (!empty($post_terms)) $postdata['terms'] = $post_terms;
589 589
 
590
-		preg_match_all( '|<wp:comment>(.+?)</wp:comment>|is', $post, $comments );
590
+		preg_match_all('|<wp:comment>(.+?)</wp:comment>|is', $post, $comments);
591 591
 		$comments = $comments[1];
592
-		if ( $comments ) {
593
-			foreach ( $comments as $comment ) {
594
-				preg_match_all( '|<wp:commentmeta>(.+?)</wp:commentmeta>|is', $comment, $commentmeta );
592
+		if ($comments) {
593
+			foreach ($comments as $comment) {
594
+				preg_match_all('|<wp:commentmeta>(.+?)</wp:commentmeta>|is', $comment, $commentmeta);
595 595
 				$commentmeta = $commentmeta[1];
596 596
 				$c_meta = array();
597
-				foreach ( $commentmeta as $m ) {
597
+				foreach ($commentmeta as $m) {
598 598
 					$c_meta[] = array(
599
-						'key' => $this->get_tag( $m, 'wp:meta_key' ),
600
-						'value' => $this->get_tag( $m, 'wp:meta_value' ),
599
+						'key' => $this->get_tag($m, 'wp:meta_key'),
600
+						'value' => $this->get_tag($m, 'wp:meta_value'),
601 601
 					);
602 602
 				}
603 603
 
604 604
 				$post_comments[] = array(
605
-					'comment_id' => $this->get_tag( $comment, 'wp:comment_id' ),
606
-					'comment_author' => $this->get_tag( $comment, 'wp:comment_author' ),
607
-					'comment_author_email' => $this->get_tag( $comment, 'wp:comment_author_email' ),
608
-					'comment_author_IP' => $this->get_tag( $comment, 'wp:comment_author_IP' ),
609
-					'comment_author_url' => $this->get_tag( $comment, 'wp:comment_author_url' ),
610
-					'comment_date' => $this->get_tag( $comment, 'wp:comment_date' ),
611
-					'comment_date_gmt' => $this->get_tag( $comment, 'wp:comment_date_gmt' ),
612
-					'comment_content' => $this->get_tag( $comment, 'wp:comment_content' ),
613
-					'comment_approved' => $this->get_tag( $comment, 'wp:comment_approved' ),
614
-					'comment_type' => $this->get_tag( $comment, 'wp:comment_type' ),
615
-					'comment_parent' => $this->get_tag( $comment, 'wp:comment_parent' ),
616
-					'comment_user_id' => $this->get_tag( $comment, 'wp:comment_user_id' ),
605
+					'comment_id' => $this->get_tag($comment, 'wp:comment_id'),
606
+					'comment_author' => $this->get_tag($comment, 'wp:comment_author'),
607
+					'comment_author_email' => $this->get_tag($comment, 'wp:comment_author_email'),
608
+					'comment_author_IP' => $this->get_tag($comment, 'wp:comment_author_IP'),
609
+					'comment_author_url' => $this->get_tag($comment, 'wp:comment_author_url'),
610
+					'comment_date' => $this->get_tag($comment, 'wp:comment_date'),
611
+					'comment_date_gmt' => $this->get_tag($comment, 'wp:comment_date_gmt'),
612
+					'comment_content' => $this->get_tag($comment, 'wp:comment_content'),
613
+					'comment_approved' => $this->get_tag($comment, 'wp:comment_approved'),
614
+					'comment_type' => $this->get_tag($comment, 'wp:comment_type'),
615
+					'comment_parent' => $this->get_tag($comment, 'wp:comment_parent'),
616
+					'comment_user_id' => $this->get_tag($comment, 'wp:comment_user_id'),
617 617
 					'commentmeta' => $c_meta,
618 618
 				);
619 619
 			}
620 620
 		}
621
-		if ( ! empty( $post_comments ) ) $postdata['comments'] = $post_comments;
621
+		if (!empty($post_comments)) $postdata['comments'] = $post_comments;
622 622
 
623
-		preg_match_all( '|<wp:postmeta>(.+?)</wp:postmeta>|is', $post, $postmeta );
623
+		preg_match_all('|<wp:postmeta>(.+?)</wp:postmeta>|is', $post, $postmeta);
624 624
 		$postmeta = $postmeta[1];
625
-		if ( $postmeta ) {
626
-			foreach ( $postmeta as $p ) {
625
+		if ($postmeta) {
626
+			foreach ($postmeta as $p) {
627 627
 				$post_postmeta[] = array(
628
-					'key' => $this->get_tag( $p, 'wp:meta_key' ),
629
-					'value' => $this->get_tag( $p, 'wp:meta_value' ),
628
+					'key' => $this->get_tag($p, 'wp:meta_key'),
629
+					'value' => $this->get_tag($p, 'wp:meta_value'),
630 630
 				);
631 631
 			}
632 632
 		}
633
-		if ( ! empty( $post_postmeta ) ) $postdata['postmeta'] = $post_postmeta;
633
+		if (!empty($post_postmeta)) $postdata['postmeta'] = $post_postmeta;
634 634
 
635 635
 		return $postdata;
636 636
 	}
637 637
 
638
-	function _normalize_tag( $matches ) {
639
-		return '<' . strtolower( $matches[1] );
638
+	function _normalize_tag($matches) {
639
+		return '<'.strtolower($matches[1]);
640 640
 	}
641 641
 
642
-	function fopen( $filename, $mode = 'r' ) {
643
-		if ( $this->has_gzip )
644
-			return gzopen( $filename, $mode );
645
-		return fopen( $filename, $mode );
642
+	function fopen($filename, $mode = 'r') {
643
+		if ($this->has_gzip)
644
+			return gzopen($filename, $mode);
645
+		return fopen($filename, $mode);
646 646
 	}
647 647
 
648
-	function feof( $fp ) {
649
-		if ( $this->has_gzip )
650
-			return gzeof( $fp );
651
-		return feof( $fp );
648
+	function feof($fp) {
649
+		if ($this->has_gzip)
650
+			return gzeof($fp);
651
+		return feof($fp);
652 652
 	}
653 653
 
654
-	function fgets( $fp, $len = 8192 ) {
655
-		if ( $this->has_gzip )
656
-			return gzgets( $fp, $len );
657
-		return fgets( $fp, $len );
654
+	function fgets($fp, $len = 8192) {
655
+		if ($this->has_gzip)
656
+			return gzgets($fp, $len);
657
+		return fgets($fp, $len);
658 658
 	}
659 659
 
660
-	function fclose( $fp ) {
661
-		if ( $this->has_gzip )
662
-			return gzclose( $fp );
663
-		return fclose( $fp );
660
+	function fclose($fp) {
661
+		if ($this->has_gzip)
662
+			return gzclose($fp);
663
+		return fclose($fp);
664 664
 	}
665 665
 }
Please login to merge, or discard this patch.
includes/load-plugin-and-theme-hooks.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -14,12 +14,12 @@
 block discarded – undo
14 14
 
15 15
 
16 16
 /** @define "GRAVITYVIEW_DIR" "../" */
17
-$include_path = GRAVITYVIEW_DIR . 'includes/plugin-and-theme-hooks/';
17
+$include_path = GRAVITYVIEW_DIR.'includes/plugin-and-theme-hooks/';
18 18
 
19 19
 // Abstract class
20
-require $include_path . 'abstract-gravityview-plugin-and-theme-hooks.php';
20
+require $include_path.'abstract-gravityview-plugin-and-theme-hooks.php';
21 21
 
22 22
 // Load all plugin and theme files automatically
23
-foreach ( glob( $include_path . 'class-gravityview-{plugin,theme}-hooks-*.php', GLOB_BRACE ) as $gv_hooks_filename ) {
23
+foreach (glob($include_path.'class-gravityview-{plugin,theme}-hooks-*.php', GLOB_BRACE) as $gv_hooks_filename) {
24 24
 	include $gv_hooks_filename;
25 25
 }
26 26
\ No newline at end of file
Please login to merge, or discard this patch.
plugin-and-theme-hooks/abstract-gravityview-plugin-and-theme-hooks.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -89,11 +89,11 @@  discard block
 block discarded – undo
89 89
 	 * @return void
90 90
 	 */
91 91
 	private function maybe_add_hooks() {
92
-		$class_exists = ! $this->class_name || ( $this->class_name && class_exists( $this->class_name ) );
93
-		$function_exists = ! $this->function_name || ( $this->function_name && function_exists( $this->function_name ) );
94
-		$constant_defined = ! $this->constant_name || ( $this->constant_name && defined( $this->constant_name ) );
92
+		$class_exists = !$this->class_name || ($this->class_name && class_exists($this->class_name));
93
+		$function_exists = !$this->function_name || ($this->function_name && function_exists($this->function_name));
94
+		$constant_defined = !$this->constant_name || ($this->constant_name && defined($this->constant_name));
95 95
 
96
-		if( $class_exists || $function_exists || $constant_defined ) {
96
+		if ($class_exists || $function_exists || $constant_defined) {
97 97
 			$this->add_hooks();
98 98
 		}
99 99
 	}
@@ -104,20 +104,20 @@  discard block
 block discarded – undo
104 104
 	 * @return void
105 105
 	 */
106 106
 	protected function add_hooks() {
107
-		if( $this->content_meta_keys ) {
108
-			add_filter( 'gravityview/data/parse/meta_keys', array( $this, 'merge_content_meta_keys' ), 10, 2 );
107
+		if ($this->content_meta_keys) {
108
+			add_filter('gravityview/data/parse/meta_keys', array($this, 'merge_content_meta_keys'), 10, 2);
109 109
 		}
110 110
 
111
-		if( $this->script_handles ) {
112
-			add_filter( 'gravityview_noconflict_scripts', array( $this, 'merge_noconflict_scripts' ) );
111
+		if ($this->script_handles) {
112
+			add_filter('gravityview_noconflict_scripts', array($this, 'merge_noconflict_scripts'));
113 113
 		}
114 114
 
115
-		if( $this->style_handles ) {
116
-			add_filter( 'gravityview_noconflict_styles', array( $this, 'merge_noconflict_styles' ) );
115
+		if ($this->style_handles) {
116
+			add_filter('gravityview_noconflict_styles', array($this, 'merge_noconflict_styles'));
117 117
 		}
118 118
 
119
-		if( $this->post_type_support ) {
120
-			add_filter( 'gravityview_post_type_support', array( $this, 'merge_post_type_support' ), 10, 2 );
119
+		if ($this->post_type_support) {
120
+			add_filter('gravityview_post_type_support', array($this, 'merge_post_type_support'), 10, 2);
121 121
 		}
122 122
 	}
123 123
 
@@ -131,8 +131,8 @@  discard block
 block discarded – undo
131 131
 	 *
132 132
 	 * @return array Array of features associated with a functional area of the edit screen, merged with existing values
133 133
 	 */
134
-	public function merge_post_type_support( $supports = array(), $is_hierarchical = false ) {
135
-		$supports = array_merge( $this->post_type_support, $supports );
134
+	public function merge_post_type_support($supports = array(), $is_hierarchical = false) {
135
+		$supports = array_merge($this->post_type_support, $supports);
136 136
 		return $supports;
137 137
 	}
138 138
 
@@ -145,8 +145,8 @@  discard block
 block discarded – undo
145 145
 	 *
146 146
 	 * @return array Handles, merged with existing styles
147 147
 	 */
148
-	public function merge_noconflict_styles( $handles ) {
149
-		$handles = array_merge( $this->style_handles, $handles );
148
+	public function merge_noconflict_styles($handles) {
149
+		$handles = array_merge($this->style_handles, $handles);
150 150
 		return $handles;
151 151
 	}
152 152
 
@@ -159,8 +159,8 @@  discard block
 block discarded – undo
159 159
 	 *
160 160
 	 * @return array Handles, merged with existing scripts
161 161
 	 */
162
-	public function merge_noconflict_scripts( $handles ) {
163
-		$handles = array_merge( $this->script_handles, $handles );
162
+	public function merge_noconflict_scripts($handles) {
163
+		$handles = array_merge($this->script_handles, $handles);
164 164
 		return $handles;
165 165
 	}
166 166
 
@@ -174,8 +174,8 @@  discard block
 block discarded – undo
174 174
 	 *
175 175
 	 * @return array Meta key array, merged with existing meta keys
176 176
 	 */
177
-	public function merge_content_meta_keys( $meta_keys = array(), $post_id = 0 ) {
178
-		return array_merge( $this->content_meta_keys, $meta_keys );
177
+	public function merge_content_meta_keys($meta_keys = array(), $post_id = 0) {
178
+		return array_merge($this->content_meta_keys, $meta_keys);
179 179
 	}
180 180
 
181 181
 }
182 182
\ No newline at end of file
Please login to merge, or discard this patch.