Completed
Push — master ( 72dfec...61887c )
by
unknown
06:50
created
includes/admin/pages/system-status.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -337,9 +337,9 @@
 block discarded – undo
337 337
 
338 338
 		if ( version_compare( PHP_VERSION, '5.6', '<' ) ) {
339 339
 			$php = '<mark>' . PHP_VERSION . ' - ' .
340
-			       __( 'WordPress.org recommends upgrading to PHP 5.6 or higher for better security.', 'google-calendar-events' ) .
341
-			       ' <a href="https://wordpress.org/about/requirements/" target="_blank">' . __( 'Read more.', 'google-calendar-events' ) . '</a>' .
342
-		           '</mark>';
340
+				   __( 'WordPress.org recommends upgrading to PHP 5.6 or higher for better security.', 'google-calendar-events' ) .
341
+				   ' <a href="https://wordpress.org/about/requirements/" target="_blank">' . __( 'Read more.', 'google-calendar-events' ) . '</a>' .
342
+				   '</mark>';
343 343
 		} else {
344 344
 			$php = '<mark class="ok">' . PHP_VERSION . '</mark>';
345 345
 		}
Please login to merge, or discard this patch.
includes/feeds/admin/google-admin.php 1 patch
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -82,12 +82,12 @@  discard block
 block discarded – undo
82 82
 		return array(
83 83
 			'name' => $this->feed->name,
84 84
 			'description' => __( "To read events from your public Google Calendars you'll need create a Google API key and save it here.", 'google-calendar-events' ) .
85
-			                 '<br/><br/>' .
86
-			                 '<em style="font-size: 14px;">' .
87
-			                 sprintf( __( '<strong>Note:</strong> Calendars configured to use the <strong><a href="%s" target="_blank">Google Calendar Pro add-on</a></strong> use a different method of authorization.', 'google-calendar-events' ),
88
-				                 simcal_ga_campaign_url( simcal_get_url( 'addons' ), 'core-plugin', 'settings-link' )
89
-			                 ) .
90
-			                 '</em>',
85
+							 '<br/><br/>' .
86
+							 '<em style="font-size: 14px;">' .
87
+							 sprintf( __( '<strong>Note:</strong> Calendars configured to use the <strong><a href="%s" target="_blank">Google Calendar Pro add-on</a></strong> use a different method of authorization.', 'google-calendar-events' ),
88
+								 simcal_ga_campaign_url( simcal_get_url( 'addons' ), 'core-plugin', 'settings-link' )
89
+							 ) .
90
+							 '</em>',
91 91
 			'fields' => array(
92 92
 				'api_key' => array(
93 93
 					'type'       => 'standard',
@@ -273,12 +273,12 @@  discard block
 block discarded – undo
273 273
 					'post'        => $post_id,
274 274
 					'dismissable' => false,
275 275
 					'content'     => '<p>' .
276
-					                 '<i class="simcal-icon-warning"></i> ' .
277
-					                 sprintf(
278
-						                 __( 'Your Google Calendar events will not show up until you <a href="%s">create and save a Google API key</a>.', 'google-calendar-events' ),
279
-						                 admin_url( 'edit.php?post_type=calendar&page=simple-calendar_settings&tab=feeds' )
280
-					                 ) .
281
-					                 '</p>',
276
+									 '<i class="simcal-icon-warning"></i> ' .
277
+									 sprintf(
278
+										 __( 'Your Google Calendar events will not show up until you <a href="%s">create and save a Google API key</a>.', 'google-calendar-events' ),
279
+										 admin_url( 'edit.php?post_type=calendar&page=simple-calendar_settings&tab=feeds' )
280
+									 ) .
281
+									 '</p>',
282 282
 				)
283 283
 			);
284 284
 
@@ -305,11 +305,11 @@  discard block
 block discarded – undo
305 305
 						'post'        => $post_id,
306 306
 						'dismissable' => false,
307 307
 						'content'     => '<p>' .
308
-						                 '<i class="simcal-icon-warning"></i> ' .
309
-						                 __( 'While trying to retrieve events, Google returned an error:', 'google-calendar-events' ) .
310
-						                 '<br>' . $message . '<br>' .
311
-						                 __( 'Please ensure that both your Google Calendar ID and API Key are valid and that the Google Calendar you want to display is public.', 'google-calendar-events' ) .
312
-						                 '</p>',
308
+										 '<i class="simcal-icon-warning"></i> ' .
309
+										 __( 'While trying to retrieve events, Google returned an error:', 'google-calendar-events' ) .
310
+										 '<br>' . $message . '<br>' .
311
+										 __( 'Please ensure that both your Google Calendar ID and API Key are valid and that the Google Calendar you want to display is public.', 'google-calendar-events' ) .
312
+										 '</p>',
313 313
 					)
314 314
 				);
315 315
 
Please login to merge, or discard this patch.
includes/events/event-builder.php 1 patch
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -996,23 +996,23 @@
 block discarded – undo
996 996
 		$tagregexp = implode( '|', array_values( $this->tags ) );
997 997
 
998 998
 		return '/' . '\\['                              // Opening bracket
999
-		       . '(\\[?)'                           // 1: Optional second opening bracket for escaping tags: [[tag]]
1000
-		       . "($tagregexp)"                     // 2: Tag name
1001
-		       . '(?![\\w-])'                       // Not followed by word character or hyphen
1002
-		       . '('                                // 3: Unroll the loop: Inside the opening tag
1003
-		       . '[^\\]\\/]*'                   // Not a closing bracket or forward slash
1004
-		       . '(?:' . '\\/(?!\\])'               // A forward slash not followed by a closing bracket
1005
-		       . '[^\\]\\/]*'               // Not a closing bracket or forward slash
1006
-		       . ')*?' . ')' . '(?:' . '(\\/)'                        // 4: Self closing tag ...
1007
-		       . '\\]'                          // ... and closing bracket
1008
-		       . '|' . '\\]'                          // Closing bracket
1009
-		       . '(?:' . '('                        // 5: Unroll the loop: Optionally, anything between the opening and closing tags
1010
-		       . '[^\\[]*+'             // Not an opening bracket
1011
-		       . '(?:' . '\\[(?!\\/\\2\\])' // An opening bracket not followed by the closing tag
1012
-		       . '[^\\[]*+'         // Not an opening bracket
1013
-		       . ')*+' . ')' . '\\[\\/\\2\\]'             // Closing tag
1014
-		       . ')?' . ')' . '(\\]?)'                           // 6: Optional second closing bracket for escaping tags: [[tag]]
1015
-		       . '/s';
999
+			   . '(\\[?)'                           // 1: Optional second opening bracket for escaping tags: [[tag]]
1000
+			   . "($tagregexp)"                     // 2: Tag name
1001
+			   . '(?![\\w-])'                       // Not followed by word character or hyphen
1002
+			   . '('                                // 3: Unroll the loop: Inside the opening tag
1003
+			   . '[^\\]\\/]*'                   // Not a closing bracket or forward slash
1004
+			   . '(?:' . '\\/(?!\\])'               // A forward slash not followed by a closing bracket
1005
+			   . '[^\\]\\/]*'               // Not a closing bracket or forward slash
1006
+			   . ')*?' . ')' . '(?:' . '(\\/)'                        // 4: Self closing tag ...
1007
+			   . '\\]'                          // ... and closing bracket
1008
+			   . '|' . '\\]'                          // Closing bracket
1009
+			   . '(?:' . '('                        // 5: Unroll the loop: Optionally, anything between the opening and closing tags
1010
+			   . '[^\\[]*+'             // Not an opening bracket
1011
+			   . '(?:' . '\\[(?!\\/\\2\\])' // An opening bracket not followed by the closing tag
1012
+			   . '[^\\[]*+'         // Not an opening bracket
1013
+			   . ')*+' . ')' . '\\[\\/\\2\\]'             // Closing tag
1014
+			   . ')?' . ')' . '(\\]?)'                           // 6: Optional second closing bracket for escaping tags: [[tag]]
1015
+			   . '/s';
1016 1016
 	}
1017 1017
 
1018 1018
 	//allow other plugins to register own event tags
Please login to merge, or discard this patch.