Completed
Push — master ( 0357cb...62aa4b )
by
unknown
29s
created
public/includes/wrap-shortcodes.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -23,11 +23,11 @@  discard block
 block discarded – undo
23 23
 function lasso_wrap_shortcodes( $content ) {
24 24
 	global $shortcode_tags;
25 25
 
26
-    $no_wrap_shortcode    = lasso_editor_get_option( 'no_wrap_shortcode', 'lasso_editor');
26
+	$no_wrap_shortcode    = lasso_editor_get_option( 'no_wrap_shortcode', 'lasso_editor');
27 27
 
28
-    if ($no_wrap_shortcode == 'on') {
29
-        return $content;
30
-    }
28
+	if ($no_wrap_shortcode == 'on') {
29
+		return $content;
30
+	}
31 31
 
32 32
 	if ( false === strpos( $content, '[' ) ) {
33 33
 		return $content;
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 	if ( strpos( $m[2],'aesop_'  ) === 0 ) {
79 79
 		// check against the exceptions
80 80
 		if (strpos_arr($m[2],$exception_arr1)===false) {
81
-		    return $m[0];
81
+			return $m[0];
82 82
 		}
83 83
 	}
84 84
 	if (strpos_arr($m[2],$exception_arr2)!==false) {
@@ -90,9 +90,9 @@  discard block
 block discarded – undo
90 90
 
91 91
 /* a helper function */
92 92
 function strpos_arr($haystack, $needle) {
93
-    if(!is_array($needle)) $needle = array($needle);
94
-    foreach($needle as $what) {
95
-        if(($pos = strpos($haystack, $what))!==false) return $pos;
96
-    }
97
-    return false;
93
+	if(!is_array($needle)) $needle = array($needle);
94
+	foreach($needle as $what) {
95
+		if(($pos = strpos($haystack, $what))!==false) return $pos;
96
+	}
97
+	return false;
98 98
 }
99 99
\ No newline at end of file
Please login to merge, or discard this patch.
admin/includes/menus/settings.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -98,8 +98,8 @@  discard block
 block discarded – undo
98 98
 		if ( !is_user_logged_in() )
99 99
 			return;
100 100
         
101
-        // check for lasso story engine and add a class doniting this
102
-        $ase_status = class_exists( 'Aesop_Core' ) || defined( 'LASSO_CUSTOM' ) ? 'ase-active' : 'ase-not-active';
101
+		// check for lasso story engine and add a class doniting this
102
+		$ase_status = class_exists( 'Aesop_Core' ) || defined( 'LASSO_CUSTOM' ) ? 'ase-active' : 'ase-not-active';
103 103
 
104 104
 		$article_object   = lasso_editor_get_option( 'article_class', 'lasso_editor' );
105 105
 		$featImgClass    = lasso_editor_get_option( 'featimg_class', 'lasso_editor' );
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 		$edit_post_disabled  = lasso_editor_get_option( 'post_edit_disabled', 'lasso_editor' );
111 111
 		$post_settings_disabled = lasso_editor_get_option( 'post_settings_disabled', 'lasso_editor' );
112 112
 		$allow_change_date = lasso_editor_get_option( 'allow_change_date', 'lasso_editor' );
113
-        $allow_edit_excerpt = lasso_editor_get_option( 'allow_edit_excerpt', 'lasso_editor' );
113
+		$allow_edit_excerpt = lasso_editor_get_option( 'allow_edit_excerpt', 'lasso_editor' );
114 114
 		$allow_new_category = lasso_editor_get_option( 'allow_new_category', 'lasso_editor' );
115 115
 		$shortcodify_disabled  = lasso_editor_get_option( 'shortcodify_disabled', 'lasso_editor' );
116 116
 		$enable_autosave  = lasso_editor_get_option( 'enable_autosave', 'lasso_editor' );
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
 		$bold_tag = lasso_editor_get_option( 'bold_tag', 'lasso_editor',  "b");
136 136
 		$i_tag = lasso_editor_get_option( 'i_tag', 'lasso_editor',  "i");
137 137
         
138
-        $add_table = lasso_editor_get_option('add_table', 'lasso_editor', false);
138
+		$add_table = lasso_editor_get_option('add_table', 'lasso_editor', false);
139 139
 		
140 140
 		// do we support pending status
141 141
 		$no_pending_status = lasso_editor_get_option('no_pending_status', 'lasso_editor');
@@ -147,16 +147,16 @@  discard block
 block discarded – undo
147 147
 			$insert_comp_ui = 'drag';
148 148
 		}
149 149
         
150
-        $link_prefix_http = lasso_editor_get_option('link_prefix_http', 'lasso_editor');
150
+		$link_prefix_http = lasso_editor_get_option('link_prefix_http', 'lasso_editor');
151 151
         
152
-        $use_old_wpimg = lasso_editor_get_option('use_old_wpimg', 'lasso_editor','off');
153
-        $use_wp_block_image = lasso_editor_get_option('use_wp_block_image', 'lasso_editor','off');
152
+		$use_old_wpimg = lasso_editor_get_option('use_old_wpimg', 'lasso_editor','off');
153
+		$use_wp_block_image = lasso_editor_get_option('use_wp_block_image', 'lasso_editor','off');
154 154
 		
155 155
 		$support_custom_taxonomy   = lasso_editor_get_option( 'support_custom_taxonomy', 'lasso_editor' );
156 156
         
157
-        $new_post_text    = lasso_editor_get_option( 'new_post_text', 'lasso_editor' );
157
+		$new_post_text    = lasso_editor_get_option( 'new_post_text', 'lasso_editor' );
158 158
         
159
-        $no_wrap_shortcode    = lasso_editor_get_option( 'no_wrap_shortcode', 'lasso_editor');
159
+		$no_wrap_shortcode    = lasso_editor_get_option( 'no_wrap_shortcode', 'lasso_editor');
160 160
 
161 161
 ?>
162 162
 		<div class="wrap">
Please login to merge, or discard this patch.