Completed
Push — master ( f545a8...031cda )
by
unknown
01:47
created
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/lasso.php 1 patch
Indentation   +29 added lines, -29 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);
@@ -366,59 +366,59 @@  discard block
 block discarded – undo
366 366
 		 );
367 367
 		foreach ($_POST as $key => $value) {
368 368
 			if ($key !="code" && $key !="action") {
369
-			    //$shortcode = $shortcode.$key.'="'.$value.'" ';
369
+				//$shortcode = $shortcode.$key.'="'.$value.'" ';
370 370
 				$atts[$key] = $value;
371 371
 			}
372 372
 		}
373 373
 		if ($code == "aesop_video") {
374
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-video.php');
375
-		    echo aesop_video_shortcode($atts);
374
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-video.php');
375
+			echo aesop_video_shortcode($atts);
376 376
 		}
377 377
 		else if ($code == "aesop_image") {
378
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-image.php');
379
-		    echo aesop_image_shortcode($atts);
378
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-image.php');
379
+			echo aesop_image_shortcode($atts);
380 380
 		}
381 381
 		else if ($code == "aesop_quote") {
382
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-quote.php');
383
-		    echo aesop_quote_shortcode($atts);
382
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-quote.php');
383
+			echo aesop_quote_shortcode($atts);
384 384
 		}
385 385
 		else if ($code == "aesop_parallax") {
386
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-parallax.php');
387
-		    echo aesop_parallax_shortcode($atts);
386
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-parallax.php');
387
+			echo aesop_parallax_shortcode($atts);
388 388
 		}
389 389
 		else if ($code == "aesop_character") {
390
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-character.php');
391
-		    echo aesop_character_shortcode($atts);
390
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-character.php');
391
+			echo aesop_character_shortcode($atts);
392 392
 		}
393 393
 		else if ($code == "aesop_collection") {
394
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-collections.php');
395
-		    echo aesop_collection_shortcode($atts);
394
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-collections.php');
395
+			echo aesop_collection_shortcode($atts);
396 396
 		}
397 397
 		else if ($code == "aesop_chapter") {
398
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-heading.php');
399
-		    echo aesop_chapter_shortcode($atts);
398
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-heading.php');
399
+			echo aesop_chapter_shortcode($atts);
400 400
 		}
401 401
 		else if ($code == "aesop_content") {
402
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-cbox.php');
403
-		    echo aesop_content_shortcode($atts, $atts['content_data']);
402
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-cbox.php');
403
+			echo aesop_content_shortcode($atts, $atts['content_data']);
404 404
 		}
405 405
 		else if ($code == "aesop_gallery") {
406
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-gallery.php');
407
-		    echo do_shortcode( '[aesop_gallery id="'.$atts["id"].'"]');
406
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-gallery.php');
407
+			echo do_shortcode( '[aesop_gallery id="'.$atts["id"].'"]');
408 408
 		}
409 409
 		else if ($code == "aesop_audio") {
410
-		    require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-audio.php');
411
-		    echo aesop_audio_shortcode($atts);
410
+			require_once( ABSPATH . '/wp-content/plugins/aesop-story-engine/public/includes/components/component-audio.php');
411
+			echo aesop_audio_shortcode($atts);
412 412
 		}
413 413
 		else {
414 414
 			$code = '['.$code.' ';
415 415
 			foreach ($atts as $key => $value) {
416
-			    $code = ''.$key.'="'.$value.'" ';
416
+				$code = ''.$key.'="'.$value.'" ';
417 417
 			}
418 418
 			$code = $code.']';
419 419
 			echo do_shortcode($code);
420
-		    //require_once( ABSPATH . '/wp-content/plugins/aesop-events/public/includes/shortcode.php');
421
-		    //echo aesop_audio_shortcode($atts);
420
+			//require_once( ABSPATH . '/wp-content/plugins/aesop-events/public/includes/shortcode.php');
421
+			//echo aesop_audio_shortcode($atts);
422 422
 		}
423 423
 		
424 424
 		exit; 
@@ -429,14 +429,14 @@  discard block
 block discarded – undo
429 429
 			$allow_new_category = lasso_editor_get_option( 'allow_new_category', 'lasso_editor' );
430 430
 			
431 431
 			if ($taxonomy =='category') {
432
-                // convert from names to category ids
432
+				// convert from names to category ids
433 433
 				$cats = array();
434 434
 				foreach ($value as $cat) {
435 435
 					$cat_id = get_cat_ID($cat);
436 436
 					if ($cat_id !=0) {
437 437
 						$cats [] = $cat_id;
438 438
 					} else if ($allow_new_category) {
439
-					    $cats [] = wp_create_category($cat);
439
+						$cats [] = wp_create_category($cat);
440 440
 					}
441 441
 				}
442 442
 				$value = $cats;
@@ -458,7 +458,7 @@  discard block
 block discarded – undo
458 458
 	
459 459
 	public function set_date( $postid, $value) {
460 460
 		if( $value ) {
461
-            wp_update_post(
461
+			wp_update_post(
462 462
 				array (
463 463
 					'ID'            => $postid, // ID of the post to update
464 464
 					'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   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 		if ( lasso_user_can('edit_posts')) {
22 22
 			
23 23
 			/**    Returns the time offset from UTC
24
-			*/
24
+			 */
25 25
 			function get_UTC_offset() {
26 26
 				$origin_dtz = new \DateTimeZone(get_option('timezone_string'));				
27 27
 				$origin_dt = new \DateTime("now", $origin_dtz);
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 
32 32
 			wp_enqueue_style('lasso-style', LASSO_URL.'/public/assets/css/lasso.css', LASSO_VERSION, true);
33 33
 
34
-            //don't load autocomplete if it's a stockholm theme
34
+			//don't load autocomplete if it's a stockholm theme
35 35
 			$themename  	= wp_get_theme()->get('Name');
36 36
 			if ($themename !='Stockholm' ) {
37 37
 				wp_enqueue_script('jquery-ui-autocomplete');
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 			$tz_offset = get_UTC_offset();
100 100
 			$post_date = get_the_time('U', $postid);
101 101
 			$time = (time()+$tz_offset);
102
-            $delta = $time - $post_date;
102
+			$delta = $time - $post_date;
103 103
 
104 104
 			$strings = array(
105 105
 				'save' 				=> __('Save','lasso'),
@@ -151,11 +151,11 @@  discard block
 block discarded – undo
151 151
 			$gallery_nonce = wp_create_nonce( $gallery_nonce_action );
152 152
 			
153 153
 			
154
-            if ($allow_change_date) {
155
-			    $permalink = get_site_url().'/?p='.$postid;
156
-            } else {
157
-                $permalink = get_permalink($postid);
158
-            }
154
+			if ($allow_change_date) {
155
+				$permalink = get_site_url().'/?p='.$postid;
156
+			} else {
157
+				$permalink = get_permalink($postid);
158
+			}
159 159
 			
160 160
 			// rest api
161 161
 			$rest_nonce = '';
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
 				'customFields'      => $custom_fields,
248 248
 				'clickToInsert'     => ($insert_comp_ui =='click'),
249 249
 				'buttonOnEmptyP'     => ($insert_comp_ui =='mediumcom'),      // auto show a button to insert components on an empty paragraph      
250
-                'rtl'               => is_rtl(),				
250
+				'rtl'               => is_rtl(),				
251 251
 				'skipToEdit'        =>( $delta < 10 && $delta >=0 ), // if it's a new post, skip to edit mode
252 252
 			);
253 253
 
@@ -256,7 +256,7 @@  discard block
 block discarded – undo
256 256
 			
257 257
 			
258 258
 			if (!$using_restapiv2) {
259
-               // enqueue REST API V1
259
+			   // enqueue REST API V1
260 260
 			   wp_enqueue_script( 'wp-api-js', LASSO_URL.'/public/assets/js/source/util--wp-api.js', array( 'jquery', 'underscore', 'backbone' ), LASSO_VERSION, true );
261 261
 			   $settings = array( 'root' => home_url( $home_url ), 'nonce' => wp_create_nonce( 'wp_json' ) );
262 262
 			   wp_localize_script( 'wp-api-js', 'WP_API_Settings', $settings );
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
272 272
 			if ($show_color) {
273 273
 				wp_enqueue_script('lasso', LASSO_URL. "/public/assets/js/lasso{$postfix}.js", array('jquery', 'wp-api','iris'), LASSO_VERSION, true);
274 274
 			} else {
275
-			    wp_enqueue_script('lasso', LASSO_URL. "/public/assets/js/lasso{$postfix}.js", array('jquery', 'wp-api'), LASSO_VERSION, true);
275
+				wp_enqueue_script('lasso', LASSO_URL. "/public/assets/js/lasso{$postfix}.js", array('jquery', 'wp-api'), LASSO_VERSION, true);
276 276
 			}
277 277
 			wp_localize_script('lasso', 'lasso_editor', apply_filters('lasso_localized_objects', $objects ) );
278 278
 
Please login to merge, or discard this patch.
public/includes/editor-modules.php 1 patch
Indentation   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
 	$toolbar_class  = $toolbar_headings ? 'toolbar-extended' : false;
205 205
 	
206 206
 	// mobile styles
207
-    $mobile_class = $is_mobile ? 'lasso-mobile' : false;
207
+	$mobile_class = $is_mobile ? 'lasso-mobile' : false;
208 208
 	$mobile_style =$is_mobile ? 'style="bottom:0px;"' : null;
209 209
 	
210 210
 	//show color
@@ -484,7 +484,7 @@  discard block
 block discarded – undo
484 484
 						</div>
485 485
 						<?php 
486 486
 						if ($allow_change_date) { 
487
-						    $dateformat = get_option( 'date_format' ); 
487
+							$dateformat = get_option( 'date_format' ); 
488 488
 						?>
489 489
 						    <label><?php _e( 'Post Date', 'lasso' ); ?></label>
490 490
 							<input type="text" class="editus_custom_date" name="post_date" value="<?php echo get_the_time($dateformat, $postid);?>"/>
@@ -597,7 +597,7 @@  discard block
 block discarded – undo
597 597
 					<?php
598 598
 						if ( !empty( $types ) ) {
599 599
 							// get the first element
600
-						    $type = key($types);						
600
+							$type = key($types);						
601 601
 							$type = preg_replace( '/s\b/','', $type );
602 602
 							printf( '<input type="hidden" name="object" value="%s">', lcfirst( esc_attr( $type ) ) );		
603 603
 						}
@@ -625,8 +625,8 @@  discard block
 block discarded – undo
625 625
 	global $post;
626 626
 	
627 627
 	global $wp_post_types;
628
-    $labels = &$wp_post_types['post']->labels;
629
-    $labels->name = 'Articles';
628
+	$labels = &$wp_post_types['post']->labels;
629
+	$labels->name = 'Articles';
630 630
 
631 631
 	ob_start();
632 632
 
@@ -869,9 +869,9 @@  discard block
 block discarded – undo
869 869
 		$return .= '</form>';
870 870
 
871 871
 		// extra JS codes
872
-        if (isset($shortcode['codes'])) {
873
-		    $return .= $shortcode['codes'];
874
-        }
872
+		if (isset($shortcode['codes'])) {
873
+			$return .= $shortcode['codes'];
874
+		}
875 875
 		$blob[$slug] = $return;
876 876
 	}
877 877
 
@@ -920,23 +920,23 @@  discard block
 block discarded – undo
920 920
  * @return string
921 921
  */
922 922
 function lasso_editor_adjustBrightness($hex, $steps) { 
923
-    $steps = max(-255, min(255, $steps));
923
+	$steps = max(-255, min(255, $steps));
924 924
 
925
-    // Normalize into a six character long hex string
926
-    $hex = str_replace('#', '', $hex);
927
-    if (strlen($hex) == 3) {
928
-        $hex = str_repeat(substr($hex,0,1), 2).str_repeat(substr($hex,1,1), 2).str_repeat(substr($hex,2,1), 2);
929
-    }
925
+	// Normalize into a six character long hex string
926
+	$hex = str_replace('#', '', $hex);
927
+	if (strlen($hex) == 3) {
928
+		$hex = str_repeat(substr($hex,0,1), 2).str_repeat(substr($hex,1,1), 2).str_repeat(substr($hex,2,1), 2);
929
+	}
930 930
 
931
-    // Split into three parts: R, G and B
932
-    $color_parts = str_split($hex, 2);
933
-    $return = '#';
931
+	// Split into three parts: R, G and B
932
+	$color_parts = str_split($hex, 2);
933
+	$return = '#';
934 934
 
935
-    foreach ($color_parts as $color) {
936
-        $color   = hexdec($color); // Convert to decimal
937
-        $color   = max(0,min(255,$color + $steps)); // Adjust color
938
-        $return .= str_pad(dechex($color), 2, '0', STR_PAD_LEFT); // Make two char hex code
939
-    }
935
+	foreach ($color_parts as $color) {
936
+		$color   = hexdec($color); // Convert to decimal
937
+		$color   = max(0,min(255,$color + $steps)); // Adjust color
938
+		$return .= str_pad(dechex($color), 2, '0', STR_PAD_LEFT); // Make two char hex code
939
+	}
940 940
 
941
-    return $return;
941
+	return $return;
942 942
 }
Please login to merge, or discard this patch.
admin/includes/load_admin.php 1 patch
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -99,8 +99,8 @@  discard block
 block discarded – undo
99 99
 
100 100
 		foreach ( $pages as $page ) {
101 101
 			wp_enqueue_media();
102
-            wp_enqueue_style( 'wp-color-picker');
103
-            wp_enqueue_script( 'wp-color-picker');
102
+			wp_enqueue_style( 'wp-color-picker');
103
+			wp_enqueue_script( 'wp-color-picker');
104 104
 		
105 105
 			wp_enqueue_script( 'lasso-editor-settings-script', LASSO_URL.'/admin/assets/js/lasso-editor-settings.js', array( 'jquery','wp-color-picker' ), LASSO_VERSION, true );
106 106
 			wp_enqueue_style( 'lasso-editor-settings-style', LASSO_URL.'/admin/assets/css/lasso-editor-settings.css', LASSO_VERSION );
@@ -131,11 +131,11 @@  discard block
 block discarded – undo
131 131
 	}
132 132
 
133 133
 	/**
134
-	*	Adds an admin notice reminding the user if their license key has not been saved
135
-	*
136
-	*	@since 0.9.7
137
-	*	@todo make dismissible
138
-	*/
134
+	 *	Adds an admin notice reminding the user if their license key has not been saved
135
+	 *
136
+	 *	@since 0.9.7
137
+	 *	@todo make dismissible
138
+	 */
139 139
 	public function license_nag(){
140 140
 
141 141
 		$screen 	= get_current_screen();
@@ -156,26 +156,26 @@  discard block
 block discarded – undo
156 156
 
157 157
 			if ( empty( $license ) ) {
158 158
 
159
-        		printf('<div class="lasso-notice error" style="position:relative;"><p>%s %s</p>%s</div>', $message_empty, $license_link, $dismiss_link );
159
+				printf('<div class="lasso-notice error" style="position:relative;"><p>%s %s</p>%s</div>', $message_empty, $license_link, $dismiss_link );
160 160
 
161
-        	} else if ( 'invalid' == $status ){ // license key entered wrong or something
161
+			} else if ( 'invalid' == $status ){ // license key entered wrong or something
162 162
 
163 163
 				printf('<div class="lasso-notice error" style="position:relative;"><p>%s %s</p>%s</div>', $message_invalid, $license_link , $dismiss_link );
164 164
 
165
-        	} else if ( empty( $status ) ){ // license key saved but not activated
165
+			} else if ( empty( $status ) ){ // license key saved but not activated
166 166
 
167 167
 				printf('<div class="lasso-notice error" style="position:relative;"><p>%s %s</p>%s</div>', $message_inactive, $license_link, $dismiss_link );
168 168
 
169
-        	}
169
+			}
170 170
 		}
171 171
 
172 172
 	}
173 173
 
174 174
 	/**
175
-	*  Process hiding the dimiss
176
-	*
177
-	* @since 0.9.7
178
-	*/
175
+	 *  Process hiding the dimiss
176
+	 *
177
+	 * @since 0.9.7
178
+	 */
179 179
 	public function dismiss_nag() {
180 180
 
181 181
 		if ( isset( $_GET['lasso-notice'] ) && 'dismiss' == $_GET['lasso-notice'] && current_user_can('manage_options') ) {
Please login to merge, or discard this patch.