Completed
Push — master ( 98cdda...eca6c0 )
by
unknown
01:52
created
lasso.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 add_filter('register_post_type_args', 'lasso_show_in_rest', 10, 2);
49 49
 function lasso_show_in_rest($args, $post_type){
50 50
  
51
-    $allowed_post_types = lasso_editor_get_option( 'allowed_post_types', 'lasso_editor', array( ) );
51
+	$allowed_post_types = lasso_editor_get_option( 'allowed_post_types', 'lasso_editor', array( ) );
52 52
 	$allowed_post_types = apply_filters( 'lasso_allowed_post_types', $allowed_post_types );
53 53
 	if (in_array( $post_type,$allowed_post_types)) {
54 54
 		$args['show_in_rest'] = true;
@@ -57,6 +57,6 @@  discard block
 block discarded – undo
57 57
 		}
58 58
 	}
59 59
  
60
-    return $args;
60
+	return $args;
61 61
 }
62 62
 
Please login to merge, or discard this patch.
admin/includes/menus/welcome.php 1 patch
Indentation   +40 added lines, -40 removed lines patch added patch discarded remove patch
@@ -204,49 +204,49 @@
 block discarded – undo
204 204
 	 */
205 205
 	function required_plugins() {
206 206
 
207
-	    $plugins = array(
208
-
209
-	        array(
210
-	            'name'      => __('Aesop Story Engine','lasso'),
211
-	            'slug'      => 'aesop-story-engine',
212
-	            'required'  => false,
213
-	        ),
214
-
215
-	    );
216
-
217
-	    $config = array(
218
-	        'default_path' => '',                      // Default absolute path to pre-packaged plugins.
219
-	        'menu'         => 'lasso-install-plugins', // Menu slug.
220
-	        'has_notices'  => true,                    // Show admin notices or not.
221
-	        'dismissable'  => true,                    // If false, a user cannot dismiss the nag message.
222
-	        'dismiss_msg'  => '',                      // If 'dismissable' is false, this message will be output at top of nag.
223
-	        'is_automatic' => false,                   // Automatically activate plugins after installation or not.
224
-	        'message'      => '',                      // Message to output right before the plugins table.
225
-	        'strings'      => array(
226
-	            'page_title'                      => __( 'Install Required Plugins', 'lasso' ),
227
-	            'menu_title'                      => __( 'Install Plugins', 'lasso' ),
228
-	            'installing'                      => __( 'Installing Plugin: %s', 'lasso' ), // %s = plugin name.
229
-	            'oops'                            => __( 'Something went wrong with the plugin API.', 'lasso' ),
230
-	            'notice_can_install_required'     => _n_noop( 'This plugin requires the following plugin: %1$s.', 'This plugin requires the following plugins: %1$s.' ), // %1$s = plugin name(s).
231
-	            'notice_can_install_recommended'  => _n_noop( 'This plugin recommends the following plugin: %1$s.', 'This plugin recommends the following plugins: %1$s.' ), // %1$s = plugin name(s).
232
-	            'notice_cannot_install'           => _n_noop( 'Sorry, but you do not have the correct permissions to install the %s plugin. Contact the administrator of this site for help on getting the plugin installed.', 'Sorry, but you do not have the correct permissions to install the %s plugins. Contact the administrator of this site for help on getting the plugins installed.' ), // %1$s = plugin name(s).
233
-	            'notice_can_activate_required'    => _n_noop( 'The following required plugin is currently inactive: %1$s.', 'The following required plugins are currently inactive: %1$s.' ), // %1$s = plugin name(s).
234
-	            'notice_can_activate_recommended' => _n_noop( 'The following recommended plugin is currently inactive: %1$s.', 'The following recommended plugins are currently inactive: %1$s.' ), // %1$s = plugin name(s).
235
-	            'notice_cannot_activate'          => _n_noop( 'Sorry, but you do not have the correct permissions to activate the %s plugin. Contact the administrator of this site for help on getting the plugin activated.', 'Sorry, but you do not have the correct permissions to activate the %s plugins. Contact the administrator of this site for help on getting the plugins activated.' ), // %1$s = plugin name(s).
236
-	            'notice_ask_to_update'            => _n_noop( 'The following plugin needs to be updated to its latest version to ensure maximum compatibility with this plugin: %1$s.', 'The following plugins need to be updated to their latest version to ensure maximum compatibility with this plugin: %1$s.' ), // %1$s = plugin name(s).
237
-	            'notice_cannot_update'            => _n_noop( 'Sorry, but you do not have the correct permissions to update the %s plugin. Contact the administrator of this site for help on getting the plugin updated.', 'Sorry, but you do not have the correct permissions to update the %s plugins. Contact the administrator of this site for help on getting the plugins updated.' ), // %1$s = plugin name(s).
238
-	            'install_link'                    => _n_noop( 'Begin installing plugin', 'Begin installing plugins' ),
239
-	            'activate_link'                   => _n_noop( 'Begin activating plugin', 'Begin activating plugins' ),
240
-	            'return'                          => __( 'Return to Required Plugins Installer', 'lasso' ),
241
-	            'plugin_activated'                => __( 'Plugin activated successfully.', 'lasso' ),
242
-	            'complete'                        => __( 'All plugins installed and activated successfully. %s', 'lasso' ), // %s = dashboard link.
243
-	            'nag_type'                        => 'updated' // Determines admin notice type - can only be 'updated', 'update-nag' or 'error'.
244
-	        )
245
-	    );
207
+		$plugins = array(
208
+
209
+			array(
210
+				'name'      => __('Aesop Story Engine','lasso'),
211
+				'slug'      => 'aesop-story-engine',
212
+				'required'  => false,
213
+			),
214
+
215
+		);
216
+
217
+		$config = array(
218
+			'default_path' => '',                      // Default absolute path to pre-packaged plugins.
219
+			'menu'         => 'lasso-install-plugins', // Menu slug.
220
+			'has_notices'  => true,                    // Show admin notices or not.
221
+			'dismissable'  => true,                    // If false, a user cannot dismiss the nag message.
222
+			'dismiss_msg'  => '',                      // If 'dismissable' is false, this message will be output at top of nag.
223
+			'is_automatic' => false,                   // Automatically activate plugins after installation or not.
224
+			'message'      => '',                      // Message to output right before the plugins table.
225
+			'strings'      => array(
226
+				'page_title'                      => __( 'Install Required Plugins', 'lasso' ),
227
+				'menu_title'                      => __( 'Install Plugins', 'lasso' ),
228
+				'installing'                      => __( 'Installing Plugin: %s', 'lasso' ), // %s = plugin name.
229
+				'oops'                            => __( 'Something went wrong with the plugin API.', 'lasso' ),
230
+				'notice_can_install_required'     => _n_noop( 'This plugin requires the following plugin: %1$s.', 'This plugin requires the following plugins: %1$s.' ), // %1$s = plugin name(s).
231
+				'notice_can_install_recommended'  => _n_noop( 'This plugin recommends the following plugin: %1$s.', 'This plugin recommends the following plugins: %1$s.' ), // %1$s = plugin name(s).
232
+				'notice_cannot_install'           => _n_noop( 'Sorry, but you do not have the correct permissions to install the %s plugin. Contact the administrator of this site for help on getting the plugin installed.', 'Sorry, but you do not have the correct permissions to install the %s plugins. Contact the administrator of this site for help on getting the plugins installed.' ), // %1$s = plugin name(s).
233
+				'notice_can_activate_required'    => _n_noop( 'The following required plugin is currently inactive: %1$s.', 'The following required plugins are currently inactive: %1$s.' ), // %1$s = plugin name(s).
234
+				'notice_can_activate_recommended' => _n_noop( 'The following recommended plugin is currently inactive: %1$s.', 'The following recommended plugins are currently inactive: %1$s.' ), // %1$s = plugin name(s).
235
+				'notice_cannot_activate'          => _n_noop( 'Sorry, but you do not have the correct permissions to activate the %s plugin. Contact the administrator of this site for help on getting the plugin activated.', 'Sorry, but you do not have the correct permissions to activate the %s plugins. Contact the administrator of this site for help on getting the plugins activated.' ), // %1$s = plugin name(s).
236
+				'notice_ask_to_update'            => _n_noop( 'The following plugin needs to be updated to its latest version to ensure maximum compatibility with this plugin: %1$s.', 'The following plugins need to be updated to their latest version to ensure maximum compatibility with this plugin: %1$s.' ), // %1$s = plugin name(s).
237
+				'notice_cannot_update'            => _n_noop( 'Sorry, but you do not have the correct permissions to update the %s plugin. Contact the administrator of this site for help on getting the plugin updated.', 'Sorry, but you do not have the correct permissions to update the %s plugins. Contact the administrator of this site for help on getting the plugins updated.' ), // %1$s = plugin name(s).
238
+				'install_link'                    => _n_noop( 'Begin installing plugin', 'Begin installing plugins' ),
239
+				'activate_link'                   => _n_noop( 'Begin activating plugin', 'Begin activating plugins' ),
240
+				'return'                          => __( 'Return to Required Plugins Installer', 'lasso' ),
241
+				'plugin_activated'                => __( 'Plugin activated successfully.', 'lasso' ),
242
+				'complete'                        => __( 'All plugins installed and activated successfully. %s', 'lasso' ), // %s = dashboard link.
243
+				'nag_type'                        => 'updated' // Determines admin notice type - can only be 'updated', 'update-nag' or 'error'.
244
+			)
245
+		);
246 246
 		
247 247
 		$plugins = apply_filters( 'lasso_required_plugins', $plugins );
248 248
 
249
-	    tgmpa( $plugins, $config );
249
+		tgmpa( $plugins, $config );
250 250
 
251 251
 	}
252 252
 }
Please login to merge, or discard this patch.
includes/process/update_object.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 	 *  @since    0.9.3
135 135
 	 *
136 136
 	 *  @param    int    	$postid       	The current postid
137
-     *  @param    string|bool     $value    The term slug, or a comma separated list of slugs. Or false to remove all terms set for post.
137
+	 *  @param    string|bool     $value    The term slug, or a comma separated list of slugs. Or false to remove all terms set for post.
138 138
 	 *  @param    string     $taxonomy    	The name of the taxonomy to which the term belongs.
139 139
 	 *
140 140
 	 *  @return bool True if update was successful, false if not.
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 			}
148 148
 			
149 149
 			if ($taxonomy =='category') {
150
-                // convert from names to category ids
150
+				// convert from names to category ids
151 151
 				$cats = array();
152 152
 				if (is_array($value)) {
153 153
 					foreach ($value as $cat) {
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 	 *
180 180
 	 *
181 181
 	 *  @param    int    	$postid       	The current postid
182
-     *  @param    string|bool     $value    The term slug, or a comma separated list of slugs. Or false to remove all terms set for post.
182
+	 *  @param    string|bool     $value    The term slug, or a comma separated list of slugs. Or false to remove all terms set for post.
183 183
 	 *                                      The first item is the name of taxonomy
184 184
 	 *
185 185
 	 *  @return bool True if update was successful, false if not.
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
 				$value = explode( ',', $value );
193 193
 			}
194 194
 						
195
-            // Deleting first array item
195
+			// Deleting first array item
196 196
 			$taxonomy = array_shift($value);
197 197
 			$cats = array();
198 198
 			foreach ($value as $cat) {
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 		
215 215
 		if( $value ) {
216 216
 			$time = current_time('mysql');
217
-            wp_update_post(
217
+			wp_update_post(
218 218
 				array (
219 219
 					'ID'            => $postid, // ID of the post to update
220 220
 					'post_date'     => date( 'Y-m-d H:i:s',  strtotime($value) ),
Please login to merge, or discard this patch.
public/includes/assets.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 			$postid 			= get_the_ID();
82 82
 			
83 83
 			$post_date = get_the_time('U', $postid);
84
-            $delta = time() - $post_date;
84
+			$delta = time() - $post_date;
85 85
 
86 86
 			$strings = array(
87 87
 				'save' 				=> __('Save','lasso'),
@@ -127,11 +127,11 @@  discard block
 block discarded – undo
127 127
 			$gallery_nonce = wp_create_nonce( $gallery_nonce_action );
128 128
 			
129 129
 			
130
-            if ($allow_change_date) {
131
-			    $permalink = get_site_url().'/?p='.$postid;
132
-            } else {
133
-                $permalink = get_permalink($postid);
134
-            }
130
+			if ($allow_change_date) {
131
+				$permalink = get_site_url().'/?p='.$postid;
132
+			} else {
133
+				$permalink = get_permalink($postid);
134
+			}
135 135
 			
136 136
 			// rest api
137 137
 			$rest_nonce = '';
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
 			
228 228
 			
229 229
 			if (!$using_restapiv2) {
230
-               // enqueue REST API V1
230
+			   // enqueue REST API V1
231 231
 			   wp_enqueue_script( 'wp-api-js', LASSO_URL.'/public/assets/js/source/util--wp-api.js', array( 'jquery', 'underscore', 'backbone' ), LASSO_VERSION, true );
232 232
 			   $settings = array( 'root' => home_url( $home_url ), 'nonce' => wp_create_nonce( 'wp_json' ) );
233 233
 			   wp_localize_script( 'wp-api-js', 'WP_API_Settings', $settings );
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
243 243
 			if ($show_color) {
244 244
 				wp_enqueue_script('lasso', LASSO_URL. "/public/assets/js/lasso{$postfix}.js", array('jquery', 'wp-api','iris'), LASSO_VERSION, true);
245 245
 			} else {
246
-			    wp_enqueue_script('lasso', LASSO_URL. "/public/assets/js/lasso{$postfix}.js", array('jquery', 'wp-api'), LASSO_VERSION, true);
246
+				wp_enqueue_script('lasso', LASSO_URL. "/public/assets/js/lasso{$postfix}.js", array('jquery', 'wp-api'), LASSO_VERSION, true);
247 247
 			}
248 248
 			wp_localize_script('lasso', 'lasso_editor', apply_filters('lasso_localized_objects', $objects ) );
249 249
 
Please login to merge, or discard this patch.
public/includes/editor-modules.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 	$toolbar_class  = $toolbar_headings ? 'toolbar-extended' : false;
152 152
 	
153 153
 	// mobile styles
154
-    $mobile_class = $is_mobile ? 'lasso-mobile' : false;
154
+	$mobile_class = $is_mobile ? 'lasso-mobile' : false;
155 155
 	$mobile_style =$is_mobile ? 'style="bottom:0px;"' : null;
156 156
 	
157 157
 	//show color
@@ -430,7 +430,7 @@  discard block
 block discarded – undo
430 430
 						</div>
431 431
 						<?php 
432 432
 						if ($allow_change_date) { 
433
-						    $dateformat = get_option( 'date_format' ); 
433
+							$dateformat = get_option( 'date_format' ); 
434 434
 						?>
435 435
 						    <label><?php _e( 'Post Date', 'lasso' ); ?></label>
436 436
 							<input type="text" class="editus_custom_date" name="post_date" value="<?php echo get_the_time($dateformat, $postid);?>"/>
@@ -567,8 +567,8 @@  discard block
 block discarded – undo
567 567
 	global $post;
568 568
 	
569 569
 	global $wp_post_types;
570
-    $labels = &$wp_post_types['post']->labels;
571
-    $labels->name = 'Articles';
570
+	$labels = &$wp_post_types['post']->labels;
571
+	$labels->name = 'Articles';
572 572
 
573 573
 	ob_start();
574 574
 
Please login to merge, or discard this patch.
public/includes/lasso.php 1 patch
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -261,14 +261,14 @@  discard block
 block discarded – undo
261 261
 		$out = load_textdomain( $domain, trailingslashit( LASSO_DIR ). 'languages/' . $domain . '-' . $locale . '.mo' );
262 262
 	}
263 263
 	
264
-    // new ajax function to lock post for editing
264
+	// new ajax function to lock post for editing
265 265
 	public function editus_lock_post()
266 266
 	{
267 267
 		$post_id= $_POST["postid"];
268 268
 		$locked = wp_check_post_lock($post_id);
269 269
 		
270 270
 		if (!$locked) {
271
-		    wp_set_post_lock($post_id);
271
+			wp_set_post_lock($post_id);
272 272
 			echo "true";
273 273
 		} else {
274 274
 			$user_info = get_userdata($locked);
@@ -365,59 +365,59 @@  discard block
 block discarded – undo
365 365
 		 );
366 366
 		foreach ($_POST as $key => $value) {
367 367
 			if ($key !="code" && $key !="action") {
368
-			    //$shortcode = $shortcode.$key.'="'.$value.'" ';
368
+				//$shortcode = $shortcode.$key.'="'.$value.'" ';
369 369
 				$atts[$key] = $value;
370 370
 			}
371 371
 		}
372 372
 		if ($code == "aesop_video") {
373
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-video.php');
374
-		    echo aesop_video_shortcode($atts);
373
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-video.php');
374
+			echo aesop_video_shortcode($atts);
375 375
 		}
376 376
 		else if ($code == "aesop_image") {
377
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-image.php');
378
-		    echo aesop_image_shortcode($atts);
377
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-image.php');
378
+			echo aesop_image_shortcode($atts);
379 379
 		}
380 380
 		else if ($code == "aesop_quote") {
381
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-quote.php');
382
-		    echo aesop_quote_shortcode($atts);
381
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-quote.php');
382
+			echo aesop_quote_shortcode($atts);
383 383
 		}
384 384
 		else if ($code == "aesop_parallax") {
385
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-parallax.php');
386
-		    echo aesop_parallax_shortcode($atts);
385
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-parallax.php');
386
+			echo aesop_parallax_shortcode($atts);
387 387
 		}
388 388
 		else if ($code == "aesop_character") {
389
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-character.php');
390
-		    echo aesop_character_shortcode($atts);
389
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-character.php');
390
+			echo aesop_character_shortcode($atts);
391 391
 		}
392 392
 		else if ($code == "aesop_collection") {
393
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-collections.php');
394
-		    echo aesop_collection_shortcode($atts);
393
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-collections.php');
394
+			echo aesop_collection_shortcode($atts);
395 395
 		}
396 396
 		else if ($code == "aesop_chapter") {
397
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-heading.php');
398
-		    echo aesop_chapter_shortcode($atts);
397
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-heading.php');
398
+			echo aesop_chapter_shortcode($atts);
399 399
 		}
400 400
 		else if ($code == "aesop_content") {
401
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-cbox.php');
402
-		    echo aesop_content_shortcode($atts, $atts['content_data']);
401
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-cbox.php');
402
+			echo aesop_content_shortcode($atts, $atts['content_data']);
403 403
 		}
404 404
 		else if ($code == "aesop_gallery") {
405
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-gallery.php');
406
-		    echo do_shortcode( '[aesop_gallery id="'.$atts["id"].'"]');
405
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-gallery.php');
406
+			echo do_shortcode( '[aesop_gallery id="'.$atts["id"].'"]');
407 407
 		}
408 408
 		else if ($code == "aesop_audio") {
409
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-audio.php');
410
-		    echo aesop_audio_shortcode($atts);
409
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-audio.php');
410
+			echo aesop_audio_shortcode($atts);
411 411
 		}
412 412
 		else {
413 413
 			$code = '['.$code.' ';
414 414
 			foreach ($atts as $key => $value) {
415
-			    $code = ''.$key.'="'.$value.'" ';
415
+				$code = ''.$key.'="'.$value.'" ';
416 416
 			}
417 417
 			$code = $code.']';
418 418
 			echo do_shortcode($code);
419
-		    //require_once( ABSPATH . '/wp-content/plugins/aesop-events/public/includes/shortcode.php');
420
-		    //echo aesop_audio_shortcode($atts);
419
+			//require_once( ABSPATH . '/wp-content/plugins/aesop-events/public/includes/shortcode.php');
420
+			//echo aesop_audio_shortcode($atts);
421 421
 		}
422 422
 		
423 423
 		exit; 
@@ -427,7 +427,7 @@  discard block
 block discarded – undo
427 427
 			$value = explode( ',', $value );
428 428
 			
429 429
 			if ($taxonomy =='category') {
430
-                // convert from names to category ids
430
+				// convert from names to category ids
431 431
 				$cats = array();
432 432
 				foreach ($value as $cat) {
433 433
 					$cats [] = get_cat_ID($cat);
@@ -451,7 +451,7 @@  discard block
 block discarded – undo
451 451
 	
452 452
 	public function set_date( $postid, $value) {
453 453
 		if( $value ) {
454
-            wp_update_post(
454
+			wp_update_post(
455 455
 				array (
456 456
 					'ID'            => $postid, // ID of the post to update
457 457
 					'post_date'     => date( 'Y-m-d H:i:s',  strtotime($value) ),
Please login to merge, or discard this patch.