Completed
Push — master ( 1ef340...5a1d55 )
by Armando
12s
created
lib/class-api.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -315,9 +315,9 @@
 block discarded – undo
315 315
 
316 316
 		// If we are already logged in and not forcing a relogin, return.
317 317
 		if ( ! $force &&
318
-		     $username === $this->_username &&
319
-		     $password === $this->_password &&
320
-		     $this->is_logged_in()
318
+				 $username === $this->_username &&
319
+				 $password === $this->_password &&
320
+				 $this->is_logged_in()
321 321
 		) {
322 322
 			return true;
323 323
 		}
Please login to merge, or discard this patch.
lib/class-contextual-help.php 1 patch
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -123,11 +123,11 @@  discard block
 block discarded – undo
123 123
 			'content' => '<p><strong>' . esc_html__( 'Enter your diaspora* login details to connect your account.', 'wp-to-diaspora' ) . '</strong></p>
124 124
 				<ul>
125 125
 					<li><strong>' . esc_html__( 'diaspora* Pod', 'wp-to-diaspora' ) . '</strong>: ' .
126
-			             esc_html__( 'This is the domain name of the pod you are on (e.g. joindiaspora.com)', 'wp-to-diaspora' ) . '
126
+									 esc_html__( 'This is the domain name of the pod you are on (e.g. joindiaspora.com)', 'wp-to-diaspora' ) . '
127 127
 					<li><strong>' . esc_html__( 'Username', 'wp-to-diaspora' ) . '</strong>: ' .
128
-			             esc_html__( 'Your diaspora* username (without the pod domain).', 'wp-to-diaspora' ) . '
128
+									 esc_html__( 'Your diaspora* username (without the pod domain).', 'wp-to-diaspora' ) . '
129 129
 					<li><strong>' . esc_html__( 'Password', 'wp-to-diaspora' ) . '</strong>: ' .
130
-			             esc_html__( 'Your diaspora* password.', 'wp-to-diaspora' ) . '
130
+									 esc_html__( 'Your diaspora* password.', 'wp-to-diaspora' ) . '
131 131
 				</ul>',
132 132
 		] );
133 133
 
@@ -138,27 +138,27 @@  discard block
 block discarded – undo
138 138
 			'content' => '<p><strong>' . esc_html__( 'Define the default posting behaviour.', 'wp-to-diaspora' ) . '</strong></p>
139 139
 				<ul>
140 140
 					<li><strong>' . esc_html__( 'Post types', 'wp-to-diaspora' ) . '</strong>: ' .
141
-			             esc_html__( 'Choose the post types that are allowed to be shared to diaspora*.', 'wp-to-diaspora' ) . '
141
+									 esc_html__( 'Choose the post types that are allowed to be shared to diaspora*.', 'wp-to-diaspora' ) . '
142 142
 					<li><strong>' . esc_html__( 'Post to diaspora*', 'wp-to-diaspora' ) . '</strong>: ' .
143
-			             esc_html__( 'Automatically share new posts to diaspora* when publishing them.', 'wp-to-diaspora' ) . '
143
+									 esc_html__( 'Automatically share new posts to diaspora* when publishing them.', 'wp-to-diaspora' ) . '
144 144
 					<li><strong>' . esc_html__( 'Show "Posted at" link?', 'wp-to-diaspora' ) . '</strong>: ' .
145
-			             esc_html__( 'Add a link back to your original post, at the bottom of the diaspora* post.', 'wp-to-diaspora' ) . '
145
+									 esc_html__( 'Add a link back to your original post, at the bottom of the diaspora* post.', 'wp-to-diaspora' ) . '
146 146
 					<li><strong>' . esc_html__( 'Display', 'wp-to-diaspora' ) . '</strong>: ' .
147
-			             esc_html__( 'Choose whether you would like to post the whole post or just the excerpt.', 'wp-to-diaspora' ) . '
147
+									 esc_html__( 'Choose whether you would like to post the whole post or just the excerpt.', 'wp-to-diaspora' ) . '
148 148
 					<li><strong>' . esc_html__( 'Tags to post', 'wp-to-diaspora' ) . '</strong>: ' .
149
-			             esc_html__( 'You can add tags to your post to make it easier to find on diaspora*.' ) . '<br>
149
+									 esc_html__( 'You can add tags to your post to make it easier to find on diaspora*.' ) . '<br>
150 150
 						<ul>
151 151
 							<li><strong>' . esc_html__( 'Global tags', 'wp-to-diaspora' ) . '</strong>: ' . esc_html__( 'Tags that apply to all posts.', 'wp-to-diaspora' ) . '
152 152
 							<li><strong>' . esc_html__( 'Custom tags', 'wp-to-diaspora' ) . '</strong>: ' . esc_html__( 'Tags that apply to individual posts (can be set on each post).', 'wp-to-diaspora' ) . '
153 153
 							<li><strong>' . esc_html__( 'Post tags', 'wp-to-diaspora' ) . '</strong>: ' . esc_html__( 'Default WordPress Tags of individual posts.', 'wp-to-diaspora' ) . '
154 154
 						</ul>
155 155
 					<li><strong>' . esc_html__( 'Global tags', 'wp-to-diaspora' ) . '</strong>: ' .
156
-			             esc_html__( 'A list of tags that gets added to every post.', 'wp-to-diaspora' ) . '
156
+									 esc_html__( 'A list of tags that gets added to every post.', 'wp-to-diaspora' ) . '
157 157
 					<li><strong>' . esc_html__( 'Aspects', 'wp-to-diaspora' ) . '</strong>: ' .
158
-			             esc_html__( 'Decide which of your diaspora* aspects can see your posts.', 'wp-to-diaspora' ) . '<br>
158
+									 esc_html__( 'Decide which of your diaspora* aspects can see your posts.', 'wp-to-diaspora' ) . '<br>
159 159
 							<em>' . sprintf( esc_html__( 'Use the "%s" button to load your aspects from diaspora*.', 'wp-to-diaspora' ), esc_html__( 'Refresh Aspects', 'wp-to-diaspora' ) ) . '</em>
160 160
 					<li><strong>' . esc_html__( 'Services', 'wp-to-diaspora' ) . '</strong>: ' .
161
-			             esc_html__( 'Choose the services your new diaspora* post gets shared to.', 'wp-to-diaspora' ) . '<br>
161
+									 esc_html__( 'Choose the services your new diaspora* post gets shared to.', 'wp-to-diaspora' ) . '<br>
162 162
 							<em>' . sprintf( esc_html__( 'Use the "%s" button to fetch the list of your connected services from diaspora*.', 'wp-to-diaspora' ), esc_html__( 'Refresh Services', 'wp-to-diaspora' ) ) . '</em>
163 163
 				</ul>',
164 164
 		] );
@@ -182,9 +182,9 @@  discard block
 block discarded – undo
182 182
 				<p>' . esc_html__( 'There are a few important differences to the settings page:', 'wp-to-diaspora' ) . '</p>
183 183
 				<ul>
184 184
 					<li><strong>' . esc_html__( 'Already posted to diaspora*', 'wp-to-diaspora' ) . '</strong>: ' .
185
-			             esc_html__( 'If the post has already been posted to diaspora* a link to the diaspora* post will appear at the top.', 'wp-to-diaspora' ) . '
185
+									 esc_html__( 'If the post has already been posted to diaspora* a link to the diaspora* post will appear at the top.', 'wp-to-diaspora' ) . '
186 186
 					<li><strong>' . esc_html__( 'Custom tags', 'wp-to-diaspora' ) . '</strong>: ' .
187
-			             esc_html__( 'A list of tags that gets added to this post. Note that they are seperate from the WordPress post tags!', 'wp-to-diaspora' ) . '
187
+									 esc_html__( 'A list of tags that gets added to this post. Note that they are seperate from the WordPress post tags!', 'wp-to-diaspora' ) . '
188 188
 				</ul>
189 189
 				<p class="dashicons-before dashicons-info">' . esc_html__( 'If you don\'t see the meta box, make sure the post type you\'re on has been added to the "Post types" list on the settings page. Also make sure it has been selected from the "Screen Options" at the top of the screen.', 'wp-to-diaspora' ) . '</p>',
190 190
 		] );
@@ -197,16 +197,16 @@  discard block
 block discarded – undo
197 197
 				<p>' . esc_html__( 'Here are a few common errors and their possible solutions:', 'wp-to-diaspora' ) . '</p>
198 198
 				<ul>
199 199
 					<li><strong>' . esc_html( sprintf( __( 'Failed to initialise connection to pod "%s"', 'wp-to-diaspora' ), 'xyz' ) ) . '</strong>: ' .
200
-			             esc_html__( 'This could have multiple reasons.' ) . '
200
+									 esc_html__( 'This could have multiple reasons.' ) . '
201 201
 						<ul>
202 202
 							<li>' . esc_html__( 'Make sure that your pod domain is entered correctly.', 'wp-to-diaspora' ) . '
203 203
 							<li>' .
204
-			             esc_html__( 'It might be an SSL problem.', 'wp-to-diaspora' ) .
205
-			             sprintf( ' <a href="https://github.com/DiasPHPora/wp-to-diaspora/wiki/SSL-and-TLS-Issues" class="open-help-tab" data-help-tab="ssl">%s</a>', esc_html__( 'Learn more', 'wp-to-diaspora' ) ) . '
204
+									 esc_html__( 'It might be an SSL problem.', 'wp-to-diaspora' ) .
205
+									 sprintf( ' <a href="https://github.com/DiasPHPora/wp-to-diaspora/wiki/SSL-and-TLS-Issues" class="open-help-tab" data-help-tab="ssl">%s</a>', esc_html__( 'Learn more', 'wp-to-diaspora' ) ) . '
206 206
 							<li>' . esc_html__( 'The pod might be offline at the moment.', 'wp-to-diaspora' ) . '
207 207
 						</ul>
208 208
 					<li><strong>' . esc_html__( 'Login failed. Check your login details.', 'wp-to-diaspora' ) . '</strong>: ' .
209
-			             esc_html__( 'Make sure that your username and password are entered correctly.', 'wp-to-diaspora' ) . '
209
+									 esc_html__( 'Make sure that your username and password are entered correctly.', 'wp-to-diaspora' ) . '
210 210
 				</ul>',
211 211
 		] );
212 212
 
Please login to merge, or discard this patch.