Completed
Push — master ( 423b35...e79207 )
by Md. Mozahidur
02:17
created
footer.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -17,10 +17,10 @@
 block discarded – undo
17 17
 	<div class="footer-normal">
18 18
 		<div class="container">
19 19
 			<div class="row widget">
20
-				<div class="col-sm-6 col-md-3 widget-col widget-col-1"><?php dynamic_sidebar( 'footer_widgets_1' ); ?></div>
21
-				<div class="col-sm-6 col-md-3 widget-col widget-col-2"><?php dynamic_sidebar( 'footer_widgets_2' ); ?></div>
22
-				<div class="col-sm-6 col-md-3 widget-col widget-col-3"><?php dynamic_sidebar( 'footer_widgets_3' ); ?></div>
23
-				<div class="col-sm-6 col-md-3 widget-col widget-col-4"><?php dynamic_sidebar( 'footer_widgets_4' ); ?></div>
20
+				<div class="col-sm-6 col-md-3 widget-col widget-col-1"><?php dynamic_sidebar('footer_widgets_1'); ?></div>
21
+				<div class="col-sm-6 col-md-3 widget-col widget-col-2"><?php dynamic_sidebar('footer_widgets_2'); ?></div>
22
+				<div class="col-sm-6 col-md-3 widget-col widget-col-3"><?php dynamic_sidebar('footer_widgets_3'); ?></div>
23
+				<div class="col-sm-6 col-md-3 widget-col widget-col-4"><?php dynamic_sidebar('footer_widgets_4'); ?></div>
24 24
 			</div>
25 25
 		</div>
26 26
 	</div>
Please login to merge, or discard this patch.
page-template/page-vc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
 <div class="container">
10 10
   <div class="row">
11 11
     <main id="main" class="site-main" role="main">
12
-      <?php while ( have_posts() ) : the_post(); ?>
12
+      <?php while (have_posts()) : the_post(); ?>
13 13
         <section class="home-content">
14 14
           <?php the_content(); ?>
15 15
         </section>
Please login to merge, or discard this patch.
page.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -18,12 +18,12 @@
 block discarded – undo
18 18
 		<div class="row">
19 19
 			<main id="main" class="site-main" role="main">
20 20
 				<?php
21
-				while ( have_posts() ) : the_post();
21
+				while (have_posts()) : the_post();
22 22
 
23
-					get_template_part( 'template-parts/content', 'page' );
23
+					get_template_part('template-parts/content', 'page');
24 24
 
25 25
 					// If comments are open or we have at least one comment, load up the comment template.
26
-					if ( comments_open() || get_comments_number() ) :
26
+					if (comments_open() || get_comments_number()) :
27 27
 						comments_template();
28 28
 					endif;
29 29
 
Please login to merge, or discard this patch.
template-parts/content-search.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -11,9 +11,9 @@
 block discarded – undo
11 11
 
12 12
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
13 13
 	<header class="entry-header">
14
-		<?php the_title( sprintf( '<h3 class="entry-title"><a href="%s" rel="bookmark">', esc_url( get_permalink() ) ), '</a></h3>' ); ?>
14
+		<?php the_title(sprintf('<h3 class="entry-title"><a href="%s" rel="bookmark">', esc_url(get_permalink())), '</a></h3>'); ?>
15 15
 
16
-		<?php if ( 'post' === get_post_type() ) : ?>
16
+		<?php if ('post' === get_post_type()) : ?>
17 17
 		<div class="entry-meta">
18 18
 			<?php lighthouse_posted_on(); ?>
19 19
 		</div><!-- .entry-meta -->
Please login to merge, or discard this patch.
search.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -22,15 +22,15 @@  discard block
 block discarded – undo
22 22
 			<div class="col-md-9 content-listing">
23 23
 				<main id="main" class="site-main search-results" role="main">
24 24
 
25
-				<?php query_posts($query_string . '&showposts=99');
26
-				if ( have_posts() ) : ?>
25
+				<?php query_posts($query_string.'&showposts=99');
26
+				if (have_posts()) : ?>
27 27
 
28 28
 					<header class="page-header">
29 29
 						<div class="search-inner-page">
30
-							<form role="search" method="get" action="<?php echo esc_url( home_url( '/' ) ); ?>">
30
+							<form role="search" method="get" action="<?php echo esc_url(home_url('/')); ?>">
31 31
 							    <div class="search-wrap">
32
-							    	<label class="screen-reader-text" for="s"><?php _e( 'Search for:', 'presentation' ); ?></label>
33
-							        <input type="search" placeholder="<?php echo esc_attr( 'Search', 'presentation' ); ?>" name="s" value="<?php echo esc_attr( get_search_query() ); ?>" autocomplete="off"/>
32
+							    	<label class="screen-reader-text" for="s"><?php _e('Search for:', 'presentation'); ?></label>
33
+							        <input type="search" placeholder="<?php echo esc_attr('Search', 'presentation'); ?>" name="s" value="<?php echo esc_attr(get_search_query()); ?>" autocomplete="off"/>
34 34
 							         <button type="submit">
35 35
 						                Search
36 36
 						            </button>
@@ -38,20 +38,20 @@  discard block
 block discarded – undo
38 38
 							</form>
39 39
 						</div>
40 40
 
41
-						<h1 class="page-title"><?php printf( esc_html__( 'Search Results for: %s', 'lighthouse' ), '<span>“' . get_search_query() . '”</span>' ); ?></h1>
41
+						<h1 class="page-title"><?php printf(esc_html__('Search Results for: %s', 'lighthouse'), '<span>“'.get_search_query().'”</span>'); ?></h1>
42 42
 
43 43
 					</header><!-- .page-header -->
44 44
 
45 45
 					<?php
46 46
 					/* Start the Loop */
47
-					while ( have_posts() ) : the_post();
47
+					while (have_posts()) : the_post();
48 48
 
49 49
 						/**
50 50
 						 * Run the loop for the search to output the results.
51 51
 						 * If you want to overload this in a child theme then include a file
52 52
 						 * called content-search.php and that will be used instead.
53 53
 						 */
54
-						get_template_part( 'template-parts/content', 'search' );
54
+						get_template_part('template-parts/content', 'search');
55 55
 
56 56
 					endwhile;
57 57
 
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 
60 60
 				else :
61 61
 
62
-					get_template_part( 'template-parts/content', 'none' );
62
+					get_template_part('template-parts/content', 'none');
63 63
 
64 64
 				endif; ?>
65 65
 				</main><!-- #main -->
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 				</div>
70 70
 			</div><!-- .blog-listing -->
71 71
 		<div class="col-md-3 sidebar" role="complementary">
72
-			<?php dynamic_sidebar( 'blog_widgets' ); ?>
72
+			<?php dynamic_sidebar('blog_widgets'); ?>
73 73
 		</div>
74 74
 		</div><!-- .row -->
75 75
 	</div><!-- #primary -->
Please login to merge, or discard this patch.
inc/template-tags.php 1 patch
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -7,69 +7,69 @@  discard block
 block discarded – undo
7 7
  * @package Lighthouse
8 8
  */
9 9
 
10
-if ( ! function_exists( 'lighthouse_posted_on' ) ) :
10
+if ( ! function_exists('lighthouse_posted_on')) :
11 11
 /**
12 12
  * Prints HTML with meta information for the current post-date/time and author.
13 13
  */
14 14
 function lighthouse_posted_on() {
15 15
 	$time_string = '<time class="entry-date published updated" datetime="%1$s">%2$s</time>';
16
-	if ( get_the_time( 'U' ) !== get_the_modified_time( 'U' ) ) {
16
+	if (get_the_time('U') !== get_the_modified_time('U')) {
17 17
 		$time_string = '<time class="entry-date published" datetime="%1$s">%2$s</time><time class="updated" datetime="%3$s">%4$s</time>';
18 18
 	}
19 19
 
20
-	$time_string = sprintf( $time_string,
21
-		esc_attr( get_the_date( 'c' ) ),
22
-		esc_html( get_the_date() ),
23
-		esc_attr( get_the_modified_date( 'c' ) ),
24
-		esc_html( get_the_modified_date() )
20
+	$time_string = sprintf($time_string,
21
+		esc_attr(get_the_date('c')),
22
+		esc_html(get_the_date()),
23
+		esc_attr(get_the_modified_date('c')),
24
+		esc_html(get_the_modified_date())
25 25
 	);
26 26
 
27 27
 	$posted_on = sprintf(
28
-		esc_html_x( 'Posted on %s', 'post date', 'lighthouse' ),
29
-		'<a href="' . esc_url( get_permalink() ) . '" rel="bookmark">' . $time_string . '</a>'
28
+		esc_html_x('Posted on %s', 'post date', 'lighthouse'),
29
+		'<a href="'.esc_url(get_permalink()).'" rel="bookmark">'.$time_string.'</a>'
30 30
 	);
31 31
 
32 32
 	$byline = sprintf(
33
-		esc_html_x( 'by %s', 'post author', 'lighthouse' ),
34
-		'<span class="author vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '">' . esc_html( get_the_author() ) . '</a></span>'
33
+		esc_html_x('by %s', 'post author', 'lighthouse'),
34
+		'<span class="author vcard"><a class="url fn n" href="'.esc_url(get_author_posts_url(get_the_author_meta('ID'))).'">'.esc_html(get_the_author()).'</a></span>'
35 35
 	);
36 36
 
37
-	echo '<span class="posted-on">' . $posted_on . '</span><span class="byline"> ' . $byline . '</span>'; // WPCS: XSS OK.
37
+	echo '<span class="posted-on">'.$posted_on.'</span><span class="byline"> '.$byline.'</span>'; // WPCS: XSS OK.
38 38
 
39 39
 }
40 40
 endif;
41 41
 
42
-if ( ! function_exists( 'lighthouse_entry_footer' ) ) :
42
+if ( ! function_exists('lighthouse_entry_footer')) :
43 43
 /**
44 44
  * Prints HTML with meta information for the categories, tags and comments.
45 45
  */
46 46
 function lighthouse_entry_footer() {
47 47
 	// Hide category and tag text for pages.
48
-	if ( 'post' === get_post_type() ) {
48
+	if ('post' === get_post_type()) {
49 49
 		/* translators: used between list items, there is a space after the comma */
50
-		$categories_list = get_the_category_list( esc_html__( ', ', 'lighthouse' ) );
51
-		if ( $categories_list && lighthouse_categorized_blog() ) {
52
-			printf( '<span class="cat-links">' . esc_html__( 'Posted in %1$s', 'lighthouse' ) . '</span>', $categories_list ); // WPCS: XSS OK.
50
+		$categories_list = get_the_category_list(esc_html__(', ', 'lighthouse'));
51
+		if ($categories_list && lighthouse_categorized_blog()) {
52
+			printf('<span class="cat-links">'.esc_html__('Posted in %1$s', 'lighthouse').'</span>', $categories_list); // WPCS: XSS OK.
53 53
 		}
54 54
 
55 55
 		/* translators: used between list items, there is a space after the comma */
56
-		$tags_list = get_the_tag_list( '', esc_html__( ', ', 'lighthouse' ) );
57
-		if ( $tags_list ) {
58
-			printf( '<span class="tags-links">' . esc_html__( 'Tagged %1$s', 'lighthouse' ) . '</span>', $tags_list ); // WPCS: XSS OK.
56
+		$tags_list = get_the_tag_list('', esc_html__(', ', 'lighthouse'));
57
+		if ($tags_list) {
58
+			printf('<span class="tags-links">'.esc_html__('Tagged %1$s', 'lighthouse').'</span>', $tags_list); // WPCS: XSS OK.
59 59
 		}
60 60
 	}
61 61
 
62
-	if ( ! is_single() && ! post_password_required() && ( comments_open() || get_comments_number() ) ) {
62
+	if ( ! is_single() && ! post_password_required() && (comments_open() || get_comments_number())) {
63 63
 		echo '<span class="comments-link">';
64
-		comments_popup_link( esc_html__( 'Leave a comment', 'lighthouse' ), esc_html__( '1 Comment', 'lighthouse' ), esc_html__( '% Comments', 'lighthouse' ) );
64
+		comments_popup_link(esc_html__('Leave a comment', 'lighthouse'), esc_html__('1 Comment', 'lighthouse'), esc_html__('% Comments', 'lighthouse'));
65 65
 		echo '</span>';
66 66
 	}
67 67
 
68 68
 	edit_post_link(
69 69
 		sprintf(
70 70
 			/* translators: %s: Name of current post */
71
-			esc_html__( 'Edit %s', 'lighthouse' ),
72
-			the_title( '<span class="screen-reader-text">"', '"</span>', false )
71
+			esc_html__('Edit %s', 'lighthouse'),
72
+			the_title('<span class="screen-reader-text">"', '"</span>', false)
73 73
 		),
74 74
 		'<span class="edit-link">',
75 75
 		'</span>'
@@ -83,22 +83,22 @@  discard block
 block discarded – undo
83 83
  * @return bool
84 84
  */
85 85
 function lighthouse_categorized_blog() {
86
-	if ( false === ( $all_the_cool_cats = get_transient( 'lighthouse_categories' ) ) ) {
86
+	if (false === ($all_the_cool_cats = get_transient('lighthouse_categories'))) {
87 87
 		// Create an array of all the categories that are attached to posts.
88
-		$all_the_cool_cats = get_categories( array(
88
+		$all_the_cool_cats = get_categories(array(
89 89
 			'fields'     => 'ids',
90 90
 			'hide_empty' => 1,
91 91
 			// We only need to know if there is more than one category.
92 92
 			'number'     => 2,
93
-		) );
93
+		));
94 94
 
95 95
 		// Count the number of categories that are attached to the posts.
96
-		$all_the_cool_cats = count( $all_the_cool_cats );
96
+		$all_the_cool_cats = count($all_the_cool_cats);
97 97
 
98
-		set_transient( 'lighthouse_categories', $all_the_cool_cats );
98
+		set_transient('lighthouse_categories', $all_the_cool_cats);
99 99
 	}
100 100
 
101
-	if ( $all_the_cool_cats > 1 ) {
101
+	if ($all_the_cool_cats > 1) {
102 102
 		// This blog has more than 1 category so lighthouse_categorized_blog should return true.
103 103
 		return true;
104 104
 	} else {
@@ -111,11 +111,11 @@  discard block
 block discarded – undo
111 111
  * Flush out the transients used in lighthouse_categorized_blog.
112 112
  */
113 113
 function lighthouse_category_transient_flusher() {
114
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
114
+	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
115 115
 		return;
116 116
 	}
117 117
 	// Like, beat it. Dig?
118
-	delete_transient( 'lighthouse_categories' );
118
+	delete_transient('lighthouse_categories');
119 119
 }
120
-add_action( 'edit_category', 'lighthouse_category_transient_flusher' );
121
-add_action( 'save_post',     'lighthouse_category_transient_flusher' );
122 120
\ No newline at end of file
121
+add_action('edit_category', 'lighthouse_category_transient_flusher');
122
+add_action('save_post', 'lighthouse_category_transient_flusher');
123 123
\ No newline at end of file
Please login to merge, or discard this patch.
includes/acf/acf.php 1 patch
Spacing   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -11,9 +11,9 @@  discard block
 block discarded – undo
11 11
 Domain Path: /lang
12 12
 */
13 13
 
14
-if( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
14
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly
15 15
 
16
-if( ! class_exists('acf') ) :
16
+if ( ! class_exists('acf')) :
17 17
 
18 18
 class acf {
19 19
 	
@@ -64,9 +64,9 @@  discard block
 block discarded – undo
64 64
 			'version'			=> '5.3.3.1',
65 65
 						
66 66
 			// urls
67
-			'basename'			=> plugin_basename( __FILE__ ),
68
-			'path'				=> plugin_dir_path( __FILE__ ),
69
-			'dir'				=> plugin_dir_url( __FILE__ ),
67
+			'basename'			=> plugin_basename(__FILE__),
68
+			'path'				=> plugin_dir_path(__FILE__),
69
+			'dir'				=> plugin_dir_url(__FILE__),
70 70
 			
71 71
 			// options
72 72
 			'show_admin'		=> true,
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 		
123 123
 		
124 124
 		// admin
125
-		if( is_admin() ) {
125
+		if (is_admin()) {
126 126
 			
127 127
 			acf_include('admin/admin.php');
128 128
 			acf_include('admin/field-group.php');
@@ -139,14 +139,14 @@  discard block
 block discarded – undo
139 139
 		
140 140
 		
141 141
 		// actions
142
-		add_action('init',	array($this, 'init'), 5);
143
-		add_action('init',	array($this, 'register_post_types'), 5);
144
-		add_action('init',	array($this, 'register_post_status'), 5);
145
-		add_action('init',	array($this, 'register_assets'), 5);
142
+		add_action('init', array($this, 'init'), 5);
143
+		add_action('init', array($this, 'register_post_types'), 5);
144
+		add_action('init', array($this, 'register_post_status'), 5);
145
+		add_action('init', array($this, 'register_assets'), 5);
146 146
 		
147 147
 		
148 148
 		// filters
149
-		add_filter('posts_where',		array($this, 'posts_where'), 10, 2 );
149
+		add_filter('posts_where', array($this, 'posts_where'), 10, 2);
150 150
 		//add_filter('posts_request',	array($this, 'posts_request'), 10, 1 );
151 151
 		
152 152
 	}
@@ -168,11 +168,11 @@  discard block
 block discarded – undo
168 168
 	function init() {
169 169
 		
170 170
 		// bail early if a plugin called get_field early
171
-		if( !did_action('plugins_loaded') ) return;
171
+		if ( ! did_action('plugins_loaded')) return;
172 172
 		
173 173
 		
174 174
 		// bail early if already init
175
-		if( acf_get_setting('init') ) return;
175
+		if (acf_get_setting('init')) return;
176 176
 		
177 177
 		
178 178
 		// only run once
@@ -180,20 +180,20 @@  discard block
 block discarded – undo
180 180
 		
181 181
 		
182 182
 		// vars
183
-		$major = intval( acf_get_setting('version') );
183
+		$major = intval(acf_get_setting('version'));
184 184
 		
185 185
 		
186 186
 		// redeclare dir
187 187
 		// - allow another plugin to modify dir (maybe force SSL)
188
-		acf_update_setting('dir', plugin_dir_url( __FILE__ ));
188
+		acf_update_setting('dir', plugin_dir_url(__FILE__));
189 189
 		
190 190
 		
191 191
 		// set text domain
192
-		load_textdomain( 'acf', acf_get_path( 'lang/acf-' . get_locale() . '.mo' ) );
192
+		load_textdomain('acf', acf_get_path('lang/acf-'.get_locale().'.mo'));
193 193
 		
194 194
 		
195 195
 		// include wpml support
196
-		if( defined('ICL_SITEPRESS_VERSION') ) {
196
+		if (defined('ICL_SITEPRESS_VERSION')) {
197 197
 		
198 198
 			acf_include('core/wpml.php');
199 199
 			
@@ -263,16 +263,16 @@  discard block
 block discarded – undo
263 263
 		// register post type 'acf-field-group'
264 264
 		register_post_type('acf-field-group', array(
265 265
 			'labels'			=> array(
266
-			    'name'					=> __( 'Field Groups', 'acf' ),
267
-				'singular_name'			=> __( 'Field Group', 'acf' ),
268
-			    'add_new'				=> __( 'Add New' , 'acf' ),
269
-			    'add_new_item'			=> __( 'Add New Field Group' , 'acf' ),
270
-			    'edit_item'				=> __( 'Edit Field Group' , 'acf' ),
271
-			    'new_item'				=> __( 'New Field Group' , 'acf' ),
272
-			    'view_item'				=> __( 'View Field Group', 'acf' ),
273
-			    'search_items'			=> __( 'Search Field Groups', 'acf' ),
274
-			    'not_found'				=> __( 'No Field Groups found', 'acf' ),
275
-			    'not_found_in_trash'	=> __( 'No Field Groups found in Trash', 'acf' ), 
266
+			    'name'					=> __('Field Groups', 'acf'),
267
+				'singular_name'			=> __('Field Group', 'acf'),
268
+			    'add_new'				=> __('Add New', 'acf'),
269
+			    'add_new_item'			=> __('Add New Field Group', 'acf'),
270
+			    'edit_item'				=> __('Edit Field Group', 'acf'),
271
+			    'new_item'				=> __('New Field Group', 'acf'),
272
+			    'view_item'				=> __('View Field Group', 'acf'),
273
+			    'search_items'			=> __('Search Field Groups', 'acf'),
274
+			    'not_found'				=> __('No Field Groups found', 'acf'),
275
+			    'not_found_in_trash'	=> __('No Field Groups found in Trash', 'acf'), 
276 276
 			),
277 277
 			'public'			=> false,
278 278
 			'show_ui'			=> true,
@@ -295,16 +295,16 @@  discard block
 block discarded – undo
295 295
 		// register post type 'acf-field'
296 296
 		register_post_type('acf-field', array(
297 297
 			'labels'			=> array(
298
-			    'name'					=> __( 'Fields', 'acf' ),
299
-				'singular_name'			=> __( 'Field', 'acf' ),
300
-			    'add_new'				=> __( 'Add New' , 'acf' ),
301
-			    'add_new_item'			=> __( 'Add New Field' , 'acf' ),
302
-			    'edit_item'				=> __( 'Edit Field' , 'acf' ),
303
-			    'new_item'				=> __( 'New Field' , 'acf' ),
304
-			    'view_item'				=> __( 'View Field', 'acf' ),
305
-			    'search_items'			=> __( 'Search Fields', 'acf' ),
306
-			    'not_found'				=> __( 'No Fields found', 'acf' ),
307
-			    'not_found_in_trash'	=> __( 'No Fields found in Trash', 'acf' ), 
298
+			    'name'					=> __('Fields', 'acf'),
299
+				'singular_name'			=> __('Field', 'acf'),
300
+			    'add_new'				=> __('Add New', 'acf'),
301
+			    'add_new_item'			=> __('Add New Field', 'acf'),
302
+			    'edit_item'				=> __('Edit Field', 'acf'),
303
+			    'new_item'				=> __('New Field', 'acf'),
304
+			    'view_item'				=> __('View Field', 'acf'),
305
+			    'search_items'			=> __('Search Fields', 'acf'),
306
+			    'not_found'				=> __('No Fields found', 'acf'),
307
+			    'not_found_in_trash'	=> __('No Fields found in Trash', 'acf'), 
308 308
 			),
309 309
 			'public'			=> false,
310 310
 			'show_ui'			=> false,
@@ -343,12 +343,12 @@  discard block
 block discarded – undo
343 343
 		
344 344
 		// acf-disabled
345 345
 		register_post_status('acf-disabled', array(
346
-			'label'                     => __( 'Disabled', 'acf' ),
346
+			'label'                     => __('Disabled', 'acf'),
347 347
 			'public'                    => true,
348 348
 			'exclude_from_search'       => false,
349 349
 			'show_in_admin_all_list'    => true,
350 350
 			'show_in_admin_status_list' => true,
351
-			'label_count'               => _n_noop( 'Disabled <span class="count">(%s)</span>', 'Disabled <span class="count">(%s)</span>', 'acf' ),
351
+			'label_count'               => _n_noop('Disabled <span class="count">(%s)</span>', 'Disabled <span class="count">(%s)</span>', 'acf'),
352 352
 		));
353 353
 		
354 354
 	}
@@ -376,14 +376,14 @@  discard block
 block discarded – undo
376 376
 		
377 377
 		
378 378
 		// scripts
379
-		wp_register_script('acf-input', acf_get_dir("assets/js/acf-input{$min}.js"), array('jquery', 'jquery-ui-core', 'jquery-ui-sortable', 'jquery-ui-resizable'), $version );
380
-		wp_register_script('acf-field-group', acf_get_dir("assets/js/acf-field-group{$min}.js"), array('acf-input'), $version );
379
+		wp_register_script('acf-input', acf_get_dir("assets/js/acf-input{$min}.js"), array('jquery', 'jquery-ui-core', 'jquery-ui-sortable', 'jquery-ui-resizable'), $version);
380
+		wp_register_script('acf-field-group', acf_get_dir("assets/js/acf-field-group{$min}.js"), array('acf-input'), $version);
381 381
 		
382 382
 		
383 383
 		// styles
384
-		wp_register_style('acf-global', acf_get_dir('assets/css/acf-global.css'), array(), $version );
385
-		wp_register_style('acf-input', acf_get_dir('assets/css/acf-input.css'), array('acf-global'), $version );
386
-		wp_register_style('acf-field-group', acf_get_dir('assets/css/acf-field-group.css'), array('acf-input'), $version );
384
+		wp_register_style('acf-global', acf_get_dir('assets/css/acf-global.css'), array(), $version);
385
+		wp_register_style('acf-input', acf_get_dir('assets/css/acf-input.css'), array('acf-global'), $version);
386
+		wp_register_style('acf-field-group', acf_get_dir('assets/css/acf-field-group.css'), array('acf-input'), $version);
387 387
 		
388 388
 	}
389 389
 	
@@ -402,32 +402,32 @@  discard block
 block discarded – undo
402 402
 	*  @return	$where (string)
403 403
 	*/
404 404
 	
405
-	function posts_where( $where, $wp_query ) {
405
+	function posts_where($where, $wp_query) {
406 406
 		
407 407
 		// global
408 408
 		global $wpdb;
409 409
 		
410 410
 		
411 411
 		// acf_field_key
412
-		if( $field_key = $wp_query->get('acf_field_key') ) {
412
+		if ($field_key = $wp_query->get('acf_field_key')) {
413 413
 		
414
-			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_name = %s", $field_key );
414
+			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_name = %s", $field_key);
415 415
 			
416 416
 	    }
417 417
 	    
418 418
 	    
419 419
 	    // acf_field_name
420
-	    if( $field_name = $wp_query->get('acf_field_name') ) {
420
+	    if ($field_name = $wp_query->get('acf_field_name')) {
421 421
 	    
422
-			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_excerpt = %s", $field_name );
422
+			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_excerpt = %s", $field_name);
423 423
 			
424 424
 	    }
425 425
 	    
426 426
 	    
427 427
 	    // acf_group_key
428
-		if( $group_key = $wp_query->get('acf_group_key') ) {
428
+		if ($group_key = $wp_query->get('acf_group_key')) {
429 429
 		
430
-			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_name = %s", $group_key );
430
+			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_name = %s", $group_key);
431 431
 			
432 432
 	    }
433 433
 	    
@@ -468,7 +468,7 @@  discard block
 block discarded – undo
468 468
 
469 469
 	global $acf;
470 470
 	
471
-	if( !isset($acf) ) {
471
+	if ( ! isset($acf)) {
472 472
 	
473 473
 		$acf = new acf();
474 474
 		
Please login to merge, or discard this patch.
includes/acf/admin/admin.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -18,9 +18,9 @@  discard block
 block discarded – undo
18 18
 	function __construct() {
19 19
 	
20 20
 		// actions
21
-		add_action('admin_menu', 			array($this, 'admin_menu'));
22
-		add_action('admin_enqueue_scripts',	array($this, 'admin_enqueue_scripts'), 0);
23
-		add_action('admin_notices', 		array($this, 'admin_notices'));
21
+		add_action('admin_menu', array($this, 'admin_menu'));
22
+		add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'), 0);
23
+		add_action('admin_notices', array($this, 'admin_notices'));
24 24
 		
25 25
 	}
26 26
 	
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 	function admin_menu() {
42 42
 		
43 43
 		// bail early if no show_admin
44
-		if( !acf_get_setting('show_admin') ) {
44
+		if ( ! acf_get_setting('show_admin')) {
45 45
 			
46 46
 			return;
47 47
 			
@@ -54,12 +54,12 @@  discard block
 block discarded – undo
54 54
 		
55 55
 		
56 56
 		// add parent
57
-		add_menu_page(__("Custom Fields",'acf'), __("Custom Fields",'acf'), $cap, $slug, false, 'dashicons-welcome-widgets-menus', '80.025');
57
+		add_menu_page(__("Custom Fields", 'acf'), __("Custom Fields", 'acf'), $cap, $slug, false, 'dashicons-welcome-widgets-menus', '80.025');
58 58
 		
59 59
 		
60 60
 		// add children
61
-		add_submenu_page($slug, __('Field Groups','acf'), __('Field Groups','acf'), $cap, $slug );
62
-		add_submenu_page($slug, __('Add New','acf'), __('Add New','acf'), $cap, 'post-new.php?post_type=acf-field-group' );
61
+		add_submenu_page($slug, __('Field Groups', 'acf'), __('Field Groups', 'acf'), $cap, $slug);
62
+		add_submenu_page($slug, __('Add New', 'acf'), __('Add New', 'acf'), $cap, 'post-new.php?post_type=acf-field-group');
63 63
 		
64 64
 	}
65 65
 	
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 	
80 80
 	function admin_enqueue_scripts() {
81 81
 		
82
-		wp_enqueue_style( 'acf-global' );
82
+		wp_enqueue_style('acf-global');
83 83
 		
84 84
 	}
85 85
 	
@@ -104,19 +104,19 @@  discard block
 block discarded – undo
104 104
 		
105 105
 		
106 106
 		// bail early if no notices
107
-		if( empty($admin_notices) ) {
107
+		if (empty($admin_notices)) {
108 108
 			
109 109
 			return;
110 110
 			
111 111
 		}
112 112
 		
113 113
 		
114
-		foreach( $admin_notices as $notice ) {
114
+		foreach ($admin_notices as $notice) {
115 115
 			
116 116
 			$open = '';
117 117
 			$close = '';
118 118
 				
119
-			if( $notice['wrap'] ) {
119
+			if ($notice['wrap']) {
120 120
 				
121 121
 				$open = "<{$notice['wrap']}>";
122 122
 				$close = "</{$notice['wrap']}>";
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
 			}
125 125
 				
126 126
 			?>
127
-			<div class="notice is-dismissible <?php echo $notice['class']; ?>"><?php echo $open . $notice['text'] . $close; ?></div>
127
+			<div class="notice is-dismissible <?php echo $notice['class']; ?>"><?php echo $open.$notice['text'].$close; ?></div>
128 128
 			<?php
129 129
 				
130 130
 		}
Please login to merge, or discard this patch.
includes/acf/admin/field-group.php 1 patch
Spacing   +121 added lines, -121 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 *  @subpackage	Admin
11 11
 */
12 12
 
13
-if( ! class_exists('acf_admin_field_group') ) :
13
+if ( ! class_exists('acf_admin_field_group')) :
14 14
 
15 15
 class acf_admin_field_group {
16 16
 	
@@ -31,18 +31,18 @@  discard block
 block discarded – undo
31 31
 	function __construct() {
32 32
 		
33 33
 		// actions
34
-		add_action('current_screen',									array($this, 'current_screen'));
35
-		add_action('save_post',											array($this, 'save_post'), 10, 2);
34
+		add_action('current_screen', array($this, 'current_screen'));
35
+		add_action('save_post', array($this, 'save_post'), 10, 2);
36 36
 		
37 37
 		
38 38
 		// ajax
39
-		add_action('wp_ajax_acf/field_group/render_field_settings',		array($this, 'ajax_render_field_settings'));
40
-		add_action('wp_ajax_acf/field_group/render_location_value',		array($this, 'ajax_render_location_value'));
41
-		add_action('wp_ajax_acf/field_group/move_field',				array($this, 'ajax_move_field'));
39
+		add_action('wp_ajax_acf/field_group/render_field_settings', array($this, 'ajax_render_field_settings'));
40
+		add_action('wp_ajax_acf/field_group/render_location_value', array($this, 'ajax_render_location_value'));
41
+		add_action('wp_ajax_acf/field_group/move_field', array($this, 'ajax_move_field'));
42 42
 		
43 43
 		
44 44
 		// filters
45
-		add_filter('post_updated_messages',								array($this, 'post_updated_messages'));
45
+		add_filter('post_updated_messages', array($this, 'post_updated_messages'));
46 46
 		
47 47
 	}
48 48
 	
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 	*  @return	$messages
61 61
 	*/
62 62
 	
63
-	function post_updated_messages( $messages ) {
63
+	function post_updated_messages($messages) {
64 64
 		
65 65
 		// append to messages
66 66
 		$messages['acf-field-group'] = array(
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 	function current_screen() {
100 100
 		
101 101
 		// validate screen
102
-		if( !acf_is_screen('acf-field-group') ) {
102
+		if ( ! acf_is_screen('acf-field-group')) {
103 103
 		
104 104
 			return;
105 105
 			
@@ -111,9 +111,9 @@  discard block
 block discarded – undo
111 111
 		
112 112
 		
113 113
 		// actions
114
-		add_action('admin_enqueue_scripts',		array($this,'admin_enqueue_scripts'), 20);
115
-		add_action('admin_head', 				array($this,'admin_head'), 20);
116
-		add_action('admin_footer', 				array($this,'admin_footer'), 20);
114
+		add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'), 20);
115
+		add_action('admin_head', array($this, 'admin_head'), 20);
116
+		add_action('admin_footer', array($this, 'admin_footer'), 20);
117 117
 		
118 118
 	}
119 119
 	
@@ -169,22 +169,22 @@  discard block
 block discarded – undo
169 169
 		
170 170
 		
171 171
 		// set global var
172
-		$field_group = acf_get_field_group( $post );
172
+		$field_group = acf_get_field_group($post);
173 173
 		
174 174
 		
175 175
 		// metaboxes
176
-		add_meta_box('acf-field-group-fields', __("Fields",'acf'), array($this, 'mb_fields'), 'acf-field-group', 'normal', 'high');
177
-		add_meta_box('acf-field-group-locations', __("Location",'acf'), array($this, 'mb_locations'), 'acf-field-group', 'normal', 'high');
178
-		add_meta_box('acf-field-group-options', __("Settings",'acf'), array($this, 'mb_options'), 'acf-field-group', 'normal', 'high');
176
+		add_meta_box('acf-field-group-fields', __("Fields", 'acf'), array($this, 'mb_fields'), 'acf-field-group', 'normal', 'high');
177
+		add_meta_box('acf-field-group-locations', __("Location", 'acf'), array($this, 'mb_locations'), 'acf-field-group', 'normal', 'high');
178
+		add_meta_box('acf-field-group-options', __("Settings", 'acf'), array($this, 'mb_options'), 'acf-field-group', 'normal', 'high');
179 179
 		
180 180
 		
181 181
 		// actions
182
-		add_action('post_submitbox_misc_actions',	array($this, 'post_submitbox_misc_actions'), 10, 0);
183
-		add_action('edit_form_after_title',			array($this, 'edit_form_after_title'), 10, 0);
182
+		add_action('post_submitbox_misc_actions', array($this, 'post_submitbox_misc_actions'), 10, 0);
183
+		add_action('edit_form_after_title', array($this, 'edit_form_after_title'), 10, 0);
184 184
 		
185 185
 		
186 186
 		// filters
187
-		add_filter('screen_settings',				array($this, 'screen_settings'), 10, 1);
187
+		add_filter('screen_settings', array($this, 'screen_settings'), 10, 1);
188 188
 		
189 189
 		
190 190
 		// action for 3rd party customisation
@@ -214,27 +214,27 @@  discard block
 block discarded – undo
214 214
 		
215 215
 		// vars
216 216
 		$l10n = apply_filters('acf/field_group/admin_l10n', array(
217
-			'move_to_trash'			=> __("Move to trash. Are you sure?",'acf'),
218
-			'checked'				=> __("checked",'acf'),
219
-			'no_fields'				=> __("No toggle fields available",'acf'),
220
-			'title_is_required'		=> __("Field group title is required",'acf'),
221
-			'copy'					=> __("copy",'acf'),
222
-			'or'					=> __("or",'acf'),
223
-			'fields'				=> __("Fields",'acf'),
224
-			'parent_fields'			=> __("Parent fields",'acf'),
225
-			'sibling_fields'		=> __("Sibling fields",'acf'),
226
-			'move_field'			=> __("Move Custom Field",'acf'),
227
-			'move_field_warning'	=> __("This field cannot be moved until its changes have been saved",'acf'),
228
-			'null'					=> __("Null",'acf'),
229
-			'unload'				=> __('The changes you made will be lost if you navigate away from this page','acf'),
230
-			'field_name_start'		=> __('The string "field_" may not be used at the start of a field name','acf'),
217
+			'move_to_trash'			=> __("Move to trash. Are you sure?", 'acf'),
218
+			'checked'				=> __("checked", 'acf'),
219
+			'no_fields'				=> __("No toggle fields available", 'acf'),
220
+			'title_is_required'		=> __("Field group title is required", 'acf'),
221
+			'copy'					=> __("copy", 'acf'),
222
+			'or'					=> __("or", 'acf'),
223
+			'fields'				=> __("Fields", 'acf'),
224
+			'parent_fields'			=> __("Parent fields", 'acf'),
225
+			'sibling_fields'		=> __("Sibling fields", 'acf'),
226
+			'move_field'			=> __("Move Custom Field", 'acf'),
227
+			'move_field_warning'	=> __("This field cannot be moved until its changes have been saved", 'acf'),
228
+			'null'					=> __("Null", 'acf'),
229
+			'unload'				=> __('The changes you made will be lost if you navigate away from this page', 'acf'),
230
+			'field_name_start'		=> __('The string "field_" may not be used at the start of a field name', 'acf'),
231 231
 		));
232 232
 		
233 233
 		$o = array(
234 234
 			'post_id'				=> $post->ID,
235
-			'nonce'					=> wp_create_nonce( 'acf_nonce' ),
235
+			'nonce'					=> wp_create_nonce('acf_nonce'),
236 236
 			'admin_url'				=> admin_url(),
237
-			'ajaxurl'				=> admin_url( 'admin-ajax.php' ),
237
+			'ajaxurl'				=> admin_url('admin-ajax.php'),
238 238
 			'validation'			=> 0,
239 239
 		);
240 240
 		
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
 	*  @return	$current
276 276
 	*/
277 277
 	
278
-	function screen_settings( $html ) {
278
+	function screen_settings($html) {
279 279
 		
280 280
 		// vars
281 281
 		$checked = acf_get_user_setting('show_field_keys') ? 'checked="checked"' : '';
@@ -283,7 +283,7 @@  discard block
 block discarded – undo
283 283
 		
284 284
 		// append
285 285
 	    $html .= '<div id="acf-append-show-on-screen" class="acf-hidden">';
286
-	    $html .= '<label for="acf-field-key-hide"><input id="acf-field-key-hide" type="checkbox" value="1" name="show_field_keys" ' . $checked . ' /> ' . __('Field Keys','acf') . '</label>';
286
+	    $html .= '<label for="acf-field-key-hide"><input id="acf-field-key-hide" type="checkbox" value="1" name="show_field_keys" '.$checked.' /> '.__('Field Keys', 'acf').'</label>';
287 287
 		$html .= '</div>';
288 288
 	    
289 289
 	    
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
313 313
 		
314 314
 		
315 315
 		// vars
316
-		$status = $field_group['active'] ? __("Active",'acf') : __("Disabled",'acf');
316
+		$status = $field_group['active'] ? __("Active", 'acf') : __("Disabled", 'acf');
317 317
 		
318 318
 ?>
319 319
 <script type="text/javascript">
@@ -353,7 +353,7 @@  discard block
 block discarded – undo
353 353
 		
354 354
 		?>
355 355
 		<div id="acf-form-data" class="acf-hidden">
356
-			<input type="hidden" name="_acfnonce" value="<?php echo wp_create_nonce( 'field_group' ); ?>" />
356
+			<input type="hidden" name="_acfnonce" value="<?php echo wp_create_nonce('field_group'); ?>" />
357 357
 			<input type="hidden" name="_acf_delete_fields" value="0" id="input-delete-fields" />
358 358
 			<?php do_action('acf/field_group/form_data'); ?>
359 359
 		</div>
@@ -375,10 +375,10 @@  discard block
 block discarded – undo
375 375
 	*  @return	$post_id (int)
376 376
 	*/
377 377
 	
378
-	function save_post( $post_id, $post ) {
378
+	function save_post($post_id, $post) {
379 379
 		
380 380
 		// do not save if this is an auto save routine
381
-		if( defined('DOING_AUTOSAVE') && DOING_AUTOSAVE ) {
381
+		if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
382 382
 		
383 383
 			return $post_id;
384 384
 			
@@ -386,7 +386,7 @@  discard block
 block discarded – undo
386 386
 		
387 387
 		
388 388
 		// bail early if not acf-field-group
389
-		if( $post->post_type !== 'acf-field-group' ) {
389
+		if ($post->post_type !== 'acf-field-group') {
390 390
 			
391 391
 			return $post_id;
392 392
 			
@@ -394,7 +394,7 @@  discard block
 block discarded – undo
394 394
 		
395 395
 		
396 396
 		// only save once! WordPress save's a revision as well.
397
-		if( wp_is_post_revision($post_id) ) {
397
+		if (wp_is_post_revision($post_id)) {
398 398
 		
399 399
 	    	return $post_id;
400 400
 	    	
@@ -402,7 +402,7 @@  discard block
 block discarded – undo
402 402
         
403 403
         
404 404
 		// verify nonce
405
-		if( !acf_verify_nonce('field_group') ) {
405
+		if ( ! acf_verify_nonce('field_group')) {
406 406
 		
407 407
 			return $post_id;
408 408
 			
@@ -414,19 +414,19 @@  discard block
 block discarded – undo
414 414
 		
415 415
         
416 416
         // save fields
417
-		unset( $_POST['acf_fields']['acfcloneindex'] );
417
+		unset($_POST['acf_fields']['acfcloneindex']);
418 418
 		
419
-		if( !empty($_POST['acf_fields']) ) {
419
+		if ( ! empty($_POST['acf_fields'])) {
420 420
 			
421
-			foreach( $_POST['acf_fields'] as $field ) {
421
+			foreach ($_POST['acf_fields'] as $field) {
422 422
 				
423 423
 				// vars
424 424
 				$specific = false;
425
-				$save = acf_extract_var( $field, 'save' );
425
+				$save = acf_extract_var($field, 'save');
426 426
 				
427 427
 				
428 428
 				// only saved field if has changed
429
-				if( $save == 'meta' ) {
429
+				if ($save == 'meta') {
430 430
 				
431 431
 					$specific = array(
432 432
 						'menu_order',
@@ -437,7 +437,7 @@  discard block
 block discarded – undo
437 437
 				
438 438
 				
439 439
 				// set field parent
440
-				if( empty($field['parent']) ) {
440
+				if (empty($field['parent'])) {
441 441
 					
442 442
 					$field['parent'] = $post_id;
443 443
 					
@@ -445,7 +445,7 @@  discard block
 block discarded – undo
445 445
 				
446 446
 				
447 447
 				// save field
448
-				acf_update_field( $field, $specific );
448
+				acf_update_field($field, $specific);
449 449
 				
450 450
 			}
451 451
 			
@@ -453,16 +453,16 @@  discard block
 block discarded – undo
453 453
 		
454 454
 		
455 455
 		// delete fields
456
-        if( $_POST['_acf_delete_fields'] ) {
456
+        if ($_POST['_acf_delete_fields']) {
457 457
         	
458 458
 	    	$ids = explode('|', $_POST['_acf_delete_fields']);
459
-	    	$ids = array_map( 'intval', $ids );
459
+	    	$ids = array_map('intval', $ids);
460 460
 	    	
461
-			foreach( $ids as $id ) {
461
+			foreach ($ids as $id) {
462 462
 			
463
-				if( $id != 0 ) {
463
+				if ($id != 0) {
464 464
 				
465
-					acf_delete_field( $id );
465
+					acf_delete_field($id);
466 466
 					
467 467
 				}
468 468
 				
@@ -477,7 +477,7 @@  discard block
 block discarded – undo
477 477
         
478 478
         
479 479
 		// save field group
480
-        acf_update_field_group( $_POST['acf_field_group'] );
480
+        acf_update_field_group($_POST['acf_field_group']);
481 481
 		
482 482
 		
483 483
         // return
@@ -506,7 +506,7 @@  discard block
 block discarded – undo
506 506
 		
507 507
 		// get fields
508 508
 		$view = array(
509
-			'fields' => acf_get_fields_by_id( $field_group['ID'] )
509
+			'fields' => acf_get_fields_by_id($field_group['ID'])
510 510
 		);
511 511
 		
512 512
 		
@@ -536,7 +536,7 @@  discard block
 block discarded – undo
536 536
 		
537 537
 		
538 538
 		// field key (leave in for compatibility)
539
-		if( !acf_is_field_group_key( $field_group['key']) ) {
539
+		if ( ! acf_is_field_group_key($field_group['key'])) {
540 540
 			
541 541
 			$field_group['key'] = uniqid('group_');
542 542
 			
@@ -544,7 +544,7 @@  discard block
 block discarded – undo
544 544
 		
545 545
 		
546 546
 		// don't use view because we need access to $this context
547
-		include( acf_get_path('admin/views/field-group-options.php') );
547
+		include(acf_get_path('admin/views/field-group-options.php'));
548 548
 		
549 549
 	}
550 550
 	
@@ -569,7 +569,7 @@  discard block
 block discarded – undo
569 569
 		
570 570
 		
571 571
 		// UI needs at lease 1 location rule
572
-		if( empty($field_group['location']) ) {
572
+		if (empty($field_group['location'])) {
573 573
 			
574 574
 			$field_group['location'] = array(
575 575
 				
@@ -589,7 +589,7 @@  discard block
 block discarded – undo
589 589
 		
590 590
 		
591 591
 		// don't use view because we need access to $this context
592
-		include( acf_get_path('admin/views/field-group-locations.php') );
592
+		include(acf_get_path('admin/views/field-group-locations.php'));
593 593
 		
594 594
 	}
595 595
 	
@@ -607,10 +607,10 @@  discard block
 block discarded – undo
607 607
 	*  @return	N/A
608 608
 	*/
609 609
 	
610
-	function render_location_value( $options ) {
610
+	function render_location_value($options) {
611 611
 		
612 612
 		// vars
613
-		$options = wp_parse_args( $options, array(
613
+		$options = wp_parse_args($options, array(
614 614
 			'group_id'	=> 0,
615 615
 			'rule_id'	=> 0,
616 616
 			'value'		=> null,
@@ -623,14 +623,14 @@  discard block
 block discarded – undo
623 623
 		
624 624
 		
625 625
 		// some case's have the same outcome
626
-		if( $options['param'] == "page_parent" ) {
626
+		if ($options['param'] == "page_parent") {
627 627
 		
628 628
 			$options['param'] = "page";
629 629
 			
630 630
 		}
631 631
 
632 632
 		
633
-		switch( $options['param'] ) {
633
+		switch ($options['param']) {
634 634
 			
635 635
 			
636 636
 			/*
@@ -641,8 +641,8 @@  discard block
 block discarded – undo
641 641
 				
642 642
 				// all post types except attachment
643 643
 				$exclude = array('attachment');
644
-				$choices = acf_get_post_types( $exclude );
645
-				$choices = acf_get_pretty_post_types( $choices );
644
+				$choices = acf_get_post_types($exclude);
645
+				$choices = acf_get_pretty_post_types($choices);
646 646
 
647 647
 				break;
648 648
 				
@@ -651,7 +651,7 @@  discard block
 block discarded – undo
651 651
 				
652 652
 				// get post types
653 653
 				$exclude = array('page', 'attachment');
654
-				$post_types = acf_get_post_types( $exclude );
654
+				$post_types = acf_get_post_types($exclude);
655 655
 				
656 656
 						
657 657
 				// get posts grouped by post type
@@ -660,25 +660,25 @@  discard block
 block discarded – undo
660 660
 				));
661 661
 				
662 662
 				
663
-				if( !empty($groups) ) {
663
+				if ( ! empty($groups)) {
664 664
 			
665
-					foreach( array_keys($groups) as $group_title ) {
665
+					foreach (array_keys($groups) as $group_title) {
666 666
 						
667 667
 						// vars
668
-						$posts = acf_extract_var( $groups, $group_title );
668
+						$posts = acf_extract_var($groups, $group_title);
669 669
 						
670 670
 						
671 671
 						// override post data
672
-						foreach( array_keys($posts) as $post_id ) {
672
+						foreach (array_keys($posts) as $post_id) {
673 673
 							
674 674
 							// update
675
-							$posts[ $post_id ] = acf_get_post_title( $posts[ $post_id ] );
675
+							$posts[$post_id] = acf_get_post_title($posts[$post_id]);
676 676
 							
677 677
 						};
678 678
 						
679 679
 						
680 680
 						// append to $choices
681
-						$choices[ $group_title ] = $posts;
681
+						$choices[$group_title] = $posts;
682 682
 						
683 683
 					}
684 684
 					
@@ -689,9 +689,9 @@  discard block
 block discarded – undo
689 689
 			
690 690
 			case "post_category" :
691 691
 				
692
-				$terms = acf_get_taxonomy_terms( 'category' );
692
+				$terms = acf_get_taxonomy_terms('category');
693 693
 				
694
-				if( !empty($terms) ) {
694
+				if ( ! empty($terms)) {
695 695
 					
696 696
 					$choices = array_pop($terms);
697 697
 					
@@ -711,11 +711,11 @@  discard block
 block discarded – undo
711 711
 				
712 712
 				global $wp_post_statuses;
713 713
 				
714
-				if( !empty($wp_post_statuses) ) {
714
+				if ( ! empty($wp_post_statuses)) {
715 715
 					
716
-					foreach( $wp_post_statuses as $status ) {
716
+					foreach ($wp_post_statuses as $status) {
717 717
 						
718
-						$choices[ $status->name ] = $status->label;
718
+						$choices[$status->name] = $status->label;
719 719
 						
720 720
 					}
721 721
 					
@@ -729,9 +729,9 @@  discard block
 block discarded – undo
729 729
 				$choices = acf_get_taxonomy_terms();
730 730
 				
731 731
 				// unset post_format
732
-				if( isset($choices['post_format']) ) {
732
+				if (isset($choices['post_format'])) {
733 733
 				
734
-					unset( $choices['post_format']) ;
734
+					unset($choices['post_format']);
735 735
 					
736 736
 				}
737 737
 							
@@ -751,19 +751,19 @@  discard block
 block discarded – undo
751 751
 				));
752 752
 				
753 753
 				
754
-				if( !empty($groups) ) {
754
+				if ( ! empty($groups)) {
755 755
 			
756
-					foreach( array_keys($groups) as $group_title ) {
756
+					foreach (array_keys($groups) as $group_title) {
757 757
 						
758 758
 						// vars
759
-						$posts = acf_extract_var( $groups, $group_title );
759
+						$posts = acf_extract_var($groups, $group_title);
760 760
 						
761 761
 						
762 762
 						// override post data
763
-						foreach( array_keys($posts) as $post_id ) {
763
+						foreach (array_keys($posts) as $post_id) {
764 764
 							
765 765
 							// update
766
-							$posts[ $post_id ] = acf_get_post_title( $posts[ $post_id ] );
766
+							$posts[$post_id] = acf_get_post_title($posts[$post_id]);
767 767
 							
768 768
 						};
769 769
 						
@@ -782,11 +782,11 @@  discard block
 block discarded – undo
782 782
 			case "page_type" :
783 783
 				
784 784
 				$choices = array(
785
-					'front_page'	=>	__("Front Page",'acf'),
786
-					'posts_page'	=>	__("Posts Page",'acf'),
787
-					'top_level'		=>	__("Top Level Page (no parent)",'acf'),
788
-					'parent'		=>	__("Parent Page (has children)",'acf'),
789
-					'child'			=>	__("Child Page (has parent)",'acf'),
785
+					'front_page'	=>	__("Front Page", 'acf'),
786
+					'posts_page'	=>	__("Posts Page", 'acf'),
787
+					'top_level'		=>	__("Top Level Page (no parent)", 'acf'),
788
+					'parent'		=>	__("Parent Page (has children)", 'acf'),
789
+					'child'			=>	__("Child Page (has parent)", 'acf'),
790 790
 				);
791 791
 								
792 792
 				break;
@@ -802,14 +802,14 @@  discard block
 block discarded – undo
802 802
 			case "page_template" :
803 803
 				
804 804
 				$choices = array(
805
-					'default'	=>	__("Default Template",'acf'),
805
+					'default'	=>	__("Default Template", 'acf'),
806 806
 				);
807 807
 				
808 808
 				$templates = get_page_templates();
809 809
 				
810
-				foreach( $templates as $k => $v ) {
810
+				foreach ($templates as $k => $v) {
811 811
 				
812
-					$choices[ $v ] = $k;
812
+					$choices[$v] = $k;
813 813
 					
814 814
 				}
815 815
 				
@@ -842,7 +842,7 @@  discard block
 block discarded – undo
842 842
 				
843 843
 				
844 844
 				// multi-site
845
-				if( is_multisite() ) {
845
+				if (is_multisite()) {
846 846
 					
847 847
 					$choices = array_merge(array(
848 848
 						'super_admin' => __('Super Admin', 'acf')
@@ -856,7 +856,7 @@  discard block
 block discarded – undo
856 856
 				
857 857
 				global $wp_roles;
858 858
 				
859
-				$choices = array_merge( array('all' => __('All', 'acf')), $wp_roles->get_names() );
859
+				$choices = array_merge(array('all' => __('All', 'acf')), $wp_roles->get_names());
860 860
 			
861 861
 				break;
862 862
 				
@@ -885,13 +885,13 @@  discard block
 block discarded – undo
885 885
 				
886 886
 			case "taxonomy" :
887 887
 				
888
-				$choices = array_merge( array('all' => __('All', 'acf')), acf_get_taxonomies() );
888
+				$choices = array_merge(array('all' => __('All', 'acf')), acf_get_taxonomies());
889 889
 				
890 890
 								
891 891
 				// unset post_format
892
-				if( isset($choices['post_format']) ) {
892
+				if (isset($choices['post_format'])) {
893 893
 				
894
-					unset( $choices['post_format']);
894
+					unset($choices['post_format']);
895 895
 					
896 896
 				}
897 897
 							
@@ -914,11 +914,11 @@  discard block
 block discarded – undo
914 914
 				);
915 915
 				
916 916
 				
917
-				if( !empty( $wp_widget_factory->widgets ) ) {
917
+				if ( ! empty($wp_widget_factory->widgets)) {
918 918
 					
919
-					foreach( $wp_widget_factory->widgets as $widget ) {
919
+					foreach ($wp_widget_factory->widgets as $widget) {
920 920
 					
921
-						$choices[ $widget->id_base ] = $widget->name;
921
+						$choices[$widget->id_base] = $widget->name;
922 922
 						
923 923
 					}
924 924
 					
@@ -929,7 +929,7 @@  discard block
 block discarded – undo
929 929
 		
930 930
 		
931 931
 		// allow custom location rules
932
-		$choices = apply_filters( 'acf/location/rule_values/' . $options['param'], $choices );
932
+		$choices = apply_filters('acf/location/rule_values/'.$options['param'], $choices);
933 933
 							
934 934
 		
935 935
 		// create field
@@ -960,7 +960,7 @@  discard block
 block discarded – undo
960 960
 	function ajax_render_location_value() {
961 961
 		
962 962
 		// validate
963
-		if( !acf_verify_ajax() ) {
963
+		if ( ! acf_verify_ajax()) {
964 964
 		
965 965
 			die();
966 966
 			
@@ -968,7 +968,7 @@  discard block
 block discarded – undo
968 968
 		
969 969
 		
970 970
 		// call function
971
-		$this->render_location_value( $_POST );
971
+		$this->render_location_value($_POST);
972 972
 		
973 973
 		
974 974
 		// die
@@ -1007,7 +1007,7 @@  discard block
 block discarded – undo
1007 1007
 		
1008 1008
 		
1009 1009
 		// verify nonce
1010
-		if( !wp_verify_nonce($options['nonce'], 'acf_nonce') ) {
1010
+		if ( ! wp_verify_nonce($options['nonce'], 'acf_nonce')) {
1011 1011
 		
1012 1012
 			die(0);
1013 1013
 			
@@ -1015,7 +1015,7 @@  discard block
 block discarded – undo
1015 1015
 		
1016 1016
 		
1017 1017
 		// required
1018
-		if( !$options['type'] ) {
1018
+		if ( ! $options['type']) {
1019 1019
 		
1020 1020
 			die(0);
1021 1021
 			
@@ -1068,7 +1068,7 @@  discard block
 block discarded – undo
1068 1068
 		
1069 1069
 		
1070 1070
 		// verify nonce
1071
-		if( ! wp_verify_nonce($args['nonce'], 'acf_nonce') ) {
1071
+		if ( ! wp_verify_nonce($args['nonce'], 'acf_nonce')) {
1072 1072
 		
1073 1073
 			die();
1074 1074
 			
@@ -1076,7 +1076,7 @@  discard block
 block discarded – undo
1076 1076
 		
1077 1077
 		
1078 1078
 		// confirm?
1079
-		if( $args['field_id'] && $args['field_group_id'] ) {
1079
+		if ($args['field_id'] && $args['field_group_id']) {
1080 1080
 			
1081 1081
 			// vars 
1082 1082
 			$field = acf_get_field($args['field_id']);
@@ -1095,12 +1095,12 @@  discard block
 block discarded – undo
1095 1095
 			acf_update_field($field);
1096 1096
 			
1097 1097
 			$v1 = $field['label'];
1098
-			$v2 = '<a href="' . admin_url("post.php?post={$field_group['ID']}&action=edit") . '" target="_blank">' . $field_group['title'] . '</a>';
1098
+			$v2 = '<a href="'.admin_url("post.php?post={$field_group['ID']}&action=edit").'" target="_blank">'.$field_group['title'].'</a>';
1099 1099
 			
1100
-			echo '<p><strong>' . __('Move Complete.', 'acf') . '</strong></p>';
1101
-			echo '<p>' . sprintf( __('The %s field can now be found in the %s field group', 'acf'), $v1, $v2 ). '</p>';
1100
+			echo '<p><strong>'.__('Move Complete.', 'acf').'</strong></p>';
1101
+			echo '<p>'.sprintf(__('The %s field can now be found in the %s field group', 'acf'), $v1, $v2).'</p>';
1102 1102
 			
1103
-			echo '<a href="#" class="acf-button blue acf-close-popup">' . __("Close Window",'acf') . '</a>';
1103
+			echo '<a href="#" class="acf-button blue acf-close-popup">'.__("Close Window", 'acf').'</a>';
1104 1104
 			
1105 1105
 			die();
1106 1106
 			
@@ -1112,13 +1112,13 @@  discard block
 block discarded – undo
1112 1112
 		$choices = array();
1113 1113
 		
1114 1114
 		
1115
-		if( !empty($field_groups) ) {
1115
+		if ( ! empty($field_groups)) {
1116 1116
 			
1117
-			foreach( $field_groups as $field_group ) {
1117
+			foreach ($field_groups as $field_group) {
1118 1118
 				
1119
-				if( $field_group['ID'] ) {
1119
+				if ($field_group['ID']) {
1120 1120
 					
1121
-					$choices[ $field_group['ID'] ] = $field_group['title'];
1121
+					$choices[$field_group['ID']] = $field_group['title'];
1122 1122
 					
1123 1123
 				}
1124 1124
 				
@@ -1135,14 +1135,14 @@  discard block
 block discarded – undo
1135 1135
 		));
1136 1136
 		
1137 1137
 		
1138
-		echo '<p>' . __('Please select the destination for this field', 'acf') . '</p>';
1138
+		echo '<p>'.__('Please select the destination for this field', 'acf').'</p>';
1139 1139
 		
1140 1140
 		echo '<form id="acf-move-field-form">';
1141 1141
 		
1142 1142
 			// render
1143
-			acf_render_field_wrap( $field );
1143
+			acf_render_field_wrap($field);
1144 1144
 			
1145
-			echo '<button type="submit" class="acf-button blue">' . __("Move Field",'acf') . '</button>';
1145
+			echo '<button type="submit" class="acf-button blue">'.__("Move Field", 'acf').'</button>';
1146 1146
 			
1147 1147
 		echo '</form>';
1148 1148
 		
Please login to merge, or discard this patch.