Completed
Push — master ( 197921...45dddd )
by
unknown
03:07
created
page-templates/template-archives.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@  discard block
 block discarded – undo
5 5
 
6 6
 	<?php lsx_content_wrap_before(); ?>
7 7
 
8
-	<div id="primary" class="content-area <?php echo esc_attr( lsx_main_class() ); ?>">
8
+	<div id="primary" class="content-area <?php echo esc_attr(lsx_main_class()); ?>">
9 9
 
10 10
 		<?php lsx_content_before(); ?>
11 11
 
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 
14 14
 			<?php lsx_content_top(); ?>
15 15
 
16
-			<?php while ( have_posts() ) : the_post(); ?>
16
+			<?php while (have_posts()) : the_post(); ?>
17 17
 
18 18
 				<?php lsx_entry_before(); ?>
19 19
 
@@ -22,28 +22,28 @@  discard block
 block discarded – undo
22 22
 					<?php lsx_entry_top(); ?>
23 23
 
24 24
 					<div class="entry-content">
25
-						<h2><?php esc_html_e( 'The Last 30 Posts', 'lsx' ); ?></h3>
25
+						<h2><?php esc_html_e('The Last 30 Posts', 'lsx'); ?></h3>
26 26
                         <ul>
27
-                            <?php $loop = new WP_Query( array( 'posts_per_page' => 30 ) ); ?>
28
-                            <?php if ( $loop->have_posts() ) { while ( $loop->have_posts() ) { $loop->the_post(); ?>
27
+                            <?php $loop = new WP_Query(array('posts_per_page' => 30)); ?>
28
+                            <?php if ($loop->have_posts()) { while ($loop->have_posts()) { $loop->the_post(); ?>
29 29
                                 <?php $loop->is_home = false; ?>
30
-                                <li><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a> - <?php the_time( get_option( 'date_format' ) ); ?> - <?php echo esc_html( $post->comment_count ); ?> <?php esc_html_e( 'comments', 'lsx' ); ?></li>
30
+                                <li><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a> - <?php the_time(get_option('date_format')); ?> - <?php echo esc_html($post->comment_count); ?> <?php esc_html_e('comments', 'lsx'); ?></li>
31 31
                             <?php } } wp_reset_postdata(); ?>
32 32
                         </ul>
33 33
 
34
-                        <h2><?php esc_html_e( 'Categories', 'lsx' ); ?></h3>
34
+                        <h2><?php esc_html_e('Categories', 'lsx'); ?></h3>
35 35
 
36 36
                         <ul>
37
-                            <?php wp_list_categories( 'title_li=&hierarchical=0&show_count=1' ); ?>
37
+                            <?php wp_list_categories('title_li=&hierarchical=0&show_count=1'); ?>
38 38
                         </ul>
39 39
 
40
-                        <h2><?php esc_html_e( 'Monthly Archives', 'lsx' ); ?></h3>
40
+                        <h2><?php esc_html_e('Monthly Archives', 'lsx'); ?></h3>
41 41
 
42 42
                         <ul>
43
-                            <?php wp_get_archives( 'type=monthly&show_post_count=1' ); ?>
43
+                            <?php wp_get_archives('type=monthly&show_post_count=1'); ?>
44 44
                         </ul>
45 45
 					</div><!-- .entry-content -->
46
-					<?php edit_post_link( esc_html__( 'Edit', 'lsx' ), '<footer class="entry-meta"><span class="edit-link">', '</span></footer>' ); ?>
46
+					<?php edit_post_link(esc_html__('Edit', 'lsx'), '<footer class="entry-meta"><span class="edit-link">', '</span></footer>'); ?>
47 47
 
48 48
 					<?php lsx_entry_bottom(); ?>
49 49
 					
Please login to merge, or discard this patch.
page-templates/template-portfolio.php 2 patches
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -17,8 +17,8 @@  discard block
 block discarded – undo
17 17
 
18 18
 			<?php lsx_content_top(); ?>
19 19
 
20
-			<?php if(have_posts()) { ?>
21
-				<?php while(have_posts()) { the_post(); ?>
20
+			<?php if (have_posts()) { ?>
21
+				<?php while (have_posts()) { the_post(); ?>
22 22
 					<div class="entry-content">
23 23
 						
24 24
 						<?php the_content(); ?>
@@ -29,10 +29,10 @@  discard block
 block discarded – undo
29 29
 			<?php } ?>
30 30
 
31 31
 			<?php
32
-				if ( get_query_var( 'paged' ) ) :
33
-					$paged = get_query_var( 'paged' );
34
-				elseif ( get_query_var( 'page' ) ) :
35
-					$paged = get_query_var( 'page' );
32
+				if (get_query_var('paged')) :
33
+					$paged = get_query_var('paged');
34
+				elseif (get_query_var('page')) :
35
+					$paged = get_query_var('page');
36 36
 				else :
37 37
 					$paged = 1;
38 38
 				endif;
@@ -41,18 +41,18 @@  discard block
 block discarded – undo
41 41
 					'post_type'      => 'jetpack-portfolio',
42 42
 					'posts_per_page' => 99,
43 43
 				);
44
-				$project_query = new WP_Query ( $args );
45
-				if ( post_type_exists( 'jetpack-portfolio' ) && $project_query -> have_posts() ) :
44
+				$project_query = new WP_Query($args);
45
+				if (post_type_exists('jetpack-portfolio') && $project_query -> have_posts()) :
46 46
 			?>
47 47
 			
48 48
 				<?php lsx_portfolio_sorter(); ?>
49 49
 
50 50
 				<div class="filter-items-wrapper lsx-portfolio-wrapper">
51 51
 					<div class="filter-items-container lsx-portfolio masonry">
52
-						<?php while ( $project_query -> have_posts() ) : $project_query -> the_post(); ?>
52
+						<?php while ($project_query -> have_posts()) : $project_query -> the_post(); ?>
53 53
 
54
-							<?php if(has_post_thumbnail()) { ?>
55
-								<?php get_template_part( 'content', 'portfolio' ); ?>
54
+							<?php if (has_post_thumbnail()) { ?>
55
+								<?php get_template_part('content', 'portfolio'); ?>
56 56
 							<?php } ?>
57 57
 
58 58
 						<?php endwhile; ?>
@@ -63,17 +63,17 @@  discard block
 block discarded – undo
63 63
 
64 64
 				<section class="no-results not-found">
65 65
 					<header class="page-header">
66
-						<h1 class="page-title"><?php esc_html_e( 'Nothing Found', 'lsx' ); ?></h1>
66
+						<h1 class="page-title"><?php esc_html_e('Nothing Found', 'lsx'); ?></h1>
67 67
 					</header><!-- .page-header -->
68 68
 
69 69
 					<div class="page-content">
70
-						<?php if ( current_user_can( 'publish_posts' ) ) : ?>
70
+						<?php if (current_user_can('publish_posts')) : ?>
71 71
 
72
-							<p><?php esc_html_e( 'Ready to publish your first project?', 'lsx' ); ?> <a href="<?php echo esc_url( admin_url( 'post-new.php?post_type=jetpack-portfolio' ) ) ?>"><?php esc_html_e( 'Get started here', 'lsx' ); ?></a></p>
72
+							<p><?php esc_html_e('Ready to publish your first project?', 'lsx'); ?> <a href="<?php echo esc_url(admin_url('post-new.php?post_type=jetpack-portfolio')) ?>"><?php esc_html_e('Get started here', 'lsx'); ?></a></p>
73 73
 
74 74
 						<?php else : ?>
75 75
 
76
-							<p><?php esc_html_e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', 'lsx' ); ?></p>
76
+							<p><?php esc_html_e('It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', 'lsx'); ?></p>
77 77
 							<?php get_search_form(); ?>
78 78
 
79 79
 						<?php endif; ?>
Please login to merge, or discard this patch.
Braces   +13 added lines, -5 removed lines patch added patch discarded remove patch
@@ -33,8 +33,10 @@  discard block
 block discarded – undo
33 33
 					$paged = get_query_var( 'paged' );
34 34
 				elseif ( get_query_var( 'page' ) ) :
35 35
 					$paged = get_query_var( 'page' );
36
-				else :
36
+				else {
37
+					:
37 38
 					$paged = 1;
39
+				}
38 40
 				endif;
39 41
 
40 42
 				$args = array(
@@ -59,11 +61,14 @@  discard block
 block discarded – undo
59 61
 					</div>
60 62
 				</div><!-- .portfolio-wrapper -->
61 63
 
62
-			<?php else : ?>
64
+			<?php else {
65
+	: ?>
63 66
 
64 67
 				<section class="no-results not-found">
65 68
 					<header class="page-header">
66
-						<h1 class="page-title"><?php esc_html_e( 'Nothing Found', 'lsx' ); ?></h1>
69
+						<h1 class="page-title"><?php esc_html_e( 'Nothing Found', 'lsx' );
70
+}
71
+?></h1>
67 72
 					</header><!-- .page-header -->
68 73
 
69 74
 					<div class="page-content">
@@ -71,9 +76,12 @@  discard block
 block discarded – undo
71 76
 
72 77
 							<p><?php esc_html_e( 'Ready to publish your first project?', 'lsx' ); ?> <a href="<?php echo esc_url( admin_url( 'post-new.php?post_type=jetpack-portfolio' ) ) ?>"><?php esc_html_e( 'Get started here', 'lsx' ); ?></a></p>
73 78
 
74
-						<?php else : ?>
79
+						<?php else {
80
+	: ?>
75 81
 
76
-							<p><?php esc_html_e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', 'lsx' ); ?></p>
82
+							<p><?php esc_html_e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', 'lsx' );
83
+}
84
+?></p>
77 85
 							<?php get_search_form(); ?>
78 86
 
79 87
 						<?php endif; ?>
Please login to merge, or discard this patch.
sidebar-sitemap.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -9,21 +9,21 @@
 block discarded – undo
9 9
 <?php
10 10
 	$show_on_front = get_option('show_on_front');
11 11
 
12
-	$layout = get_theme_mod('lsx_layout','2cr');
13
-	if('posts' == $show_on_front && is_home()){
12
+	$layout = get_theme_mod('lsx_layout', '2cr');
13
+	if ('posts' == $show_on_front && is_home()) {
14 14
 		$sidebar = 'home';
15
-	}else{
15
+	} else {
16 16
 		$sidebar = 'sidebar-1';
17 17
 	}
18 18
 	
19
-	if ( $layout !== '1c' ) : ?>
19
+	if ($layout !== '1c') : ?>
20 20
 
21 21
 	<?php lsx_sidebars_before(); ?>
22 22
 
23 23
 	<div id="secondary" class="widget-area <?php echo esc_attr(lsx_sidebar_class()); ?>" role="complementary">
24 24
 
25 25
 		<?php lsx_sidebar_top(); ?>
26
-		<h2><?php esc_attr_e( 'Categories', 'lsx' ); ?></h2>
26
+		<h2><?php esc_attr_e('Categories', 'lsx'); ?></h2>
27 27
         <aside id="categories" class="widget widget_categories">
28 28
         	<?php echo wp_tag_cloud(array('taxonomy'=>'category')); ?>
29 29
         </aside>		
Please login to merge, or discard this patch.
inc/wp-bootstrap-navwalker.php 1 patch
Spacing   +62 added lines, -62 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( ! defined( 'ABSPATH' ) ) return; // Exit if accessed directly
2
+if ( ! defined('ABSPATH')) return; // Exit if accessed directly
3 3
 
4 4
 class Lsx_Bootstrap_Navwalker extends Walker_Nav_Menu {
5 5
 
@@ -10,15 +10,15 @@  discard block
 block discarded – undo
10 10
 	 * @param string $output Passed by reference. Used to append additional content.
11 11
 	 * @param int $depth Depth of page. Used for padding.
12 12
 	 */
13
-	public function start_lvl( &$output, $depth = 0, $args = array() ) {
14
-		$indent = str_repeat( "\t", $depth );
13
+	public function start_lvl(&$output, $depth = 0, $args = array()) {
14
+		$indent = str_repeat("\t", $depth);
15 15
 		$output .= "\n$indent<ul role=\"menu\" class=\" dropdown-menu\">\n";
16 16
 	}
17 17
 	
18 18
 	/**
19 19
 	 * @param string $item Passed by reference. Used to append additional content.
20 20
 	 */
21
-	public function filter_default_pages( &$item ) {
21
+	public function filter_default_pages(&$item) {
22 22
 		
23 23
 		return $item;
24 24
 	}	
@@ -33,14 +33,14 @@  discard block
 block discarded – undo
33 33
 	 * @param int $current_page Menu item ID.
34 34
 	 * @param object $args
35 35
 	 */
36
-	public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) {
37
-		$indent = ( $depth ) ? str_repeat( "\t", $depth ) : '';	
36
+	public function start_el(&$output, $item, $depth = 0, $args = array(), $id = 0) {
37
+		$indent = ($depth) ? str_repeat("\t", $depth) : '';	
38 38
 		
39 39
 		/**
40 40
 		 * If this is a default menu being called we need to fix
41 41
 		 * the item object thats coming through.
42 42
 		 */
43
-		if(!isset($item->title)){
43
+		if ( ! isset($item->title)) {
44 44
 			return;
45 45
 		}
46 46
 
@@ -52,63 +52,63 @@  discard block
 block discarded – undo
52 52
 		 * comparison that is not case sensitive. The strcasecmp() function returns
53 53
 		 * a 0 if the strings are equal.
54 54
 		 */
55
-		if ( strcasecmp( $item->attr_title, 'divider' ) == 0 && $depth === 1 ) {
55
+		if (strcasecmp($item->attr_title, 'divider') == 0 && $depth === 1) {
56 56
 			$output .= $indent . '<li role="presentation" class="divider">';
57
-		} else if ( strcasecmp( $item->title, 'divider') == 0 && $depth === 1 ) {
57
+		} else if (strcasecmp($item->title, 'divider') == 0 && $depth === 1) {
58 58
 			$output .= $indent . '<li role="presentation" class="divider">';
59
-		} else if ( strcasecmp( $item->attr_title, 'dropdown-header') == 0 && $depth === 1 ) {
60
-			$output .= $indent . '<li role="presentation" class="dropdown-header">' . esc_attr( $item->title );
61
-		} else if ( strcasecmp($item->attr_title, 'disabled' ) == 0 ) {
62
-			$output .= $indent . '<li role="presentation" class="disabled"><a href="#">' . esc_attr( $item->title ) . '</a>';
59
+		} else if (strcasecmp($item->attr_title, 'dropdown-header') == 0 && $depth === 1) {
60
+			$output .= $indent . '<li role="presentation" class="dropdown-header">' . esc_attr($item->title);
61
+		} else if (strcasecmp($item->attr_title, 'disabled') == 0) {
62
+			$output .= $indent . '<li role="presentation" class="disabled"><a href="#">' . esc_attr($item->title) . '</a>';
63 63
 		} else {
64 64
 
65 65
 			$class_names = $value = '';
66 66
 
67
-			$classes = empty( $item->classes ) ? array() : (array) $item->classes;
67
+			$classes = empty($item->classes) ? array() : (array) $item->classes;
68 68
 			$classes[] = 'menu-item-' . $item->ID;
69 69
 
70
-			$classes = apply_filters( 'lsx_nav_menu_css_class', array_filter( $classes ), $item, $args , $depth );
70
+			$classes = apply_filters('lsx_nav_menu_css_class', array_filter($classes), $item, $args, $depth);
71 71
 			
72
-			$class_names = join( ' ', $classes );
72
+			$class_names = join(' ', $classes);
73 73
 
74
-			if ( $args->has_children )
74
+			if ($args->has_children)
75 75
 				$class_names .= ' dropdown';
76 76
 
77
-			if ( in_array( 'current-menu-item', $classes ) )
77
+			if (in_array('current-menu-item', $classes))
78 78
 				$class_names .= ' active';
79 79
 			
80
-			if ( in_array( 'current-menu-parent', $classes ) )
80
+			if (in_array('current-menu-parent', $classes))
81 81
 				$class_names .= ' active';			
82 82
 			
83 83
 			//Check if this is ment to be a "social" type menu
84
-			$class_names = $class_names ? ' class="' . esc_attr( $class_names ) . '"' : '';
84
+			$class_names = $class_names ? ' class="' . esc_attr($class_names) . '"' : '';
85 85
 
86
-			$id = apply_filters( 'nav_menu_item_id', 'menu-item-'. $item->ID, $item, $args );
87
-			$id = $id ? ' id="' . esc_attr( $id ) . '"' : '';
86
+			$id = apply_filters('nav_menu_item_id', 'menu-item-' . $item->ID, $item, $args);
87
+			$id = $id ? ' id="' . esc_attr($id) . '"' : '';
88 88
 
89
-			$output .= $indent . '<li' . $id . $value . $class_names .'>';
89
+			$output .= $indent . '<li' . $id . $value . $class_names . '>';
90 90
 
91 91
 			$atts = array();
92
-			$atts['title']  = ! empty( $item->title )	? $item->title	: '';
93
-			$atts['target'] = ! empty( $item->target )	? $item->target	: '';
94
-			$atts['rel']    = ! empty( $item->xfn )		? $item->xfn	: '';
92
+			$atts['title']  = ! empty($item->title) ? $item->title : '';
93
+			$atts['target'] = ! empty($item->target) ? $item->target : '';
94
+			$atts['rel']    = ! empty($item->xfn) ? $item->xfn : '';
95 95
 
96 96
 			// If item has_children add atts to a.
97
-			if ( $args->has_children ) {
98
-				$atts['href']   		= ! empty( $item->url ) ? $item->url : '';
99
-				$atts['data-toggle']	= 'dropdown';
100
-				$atts['class']			= 'dropdown-toggle';
101
-				$atts['aria-haspopup']	= 'true';
97
+			if ($args->has_children) {
98
+				$atts['href'] = ! empty($item->url) ? $item->url : '';
99
+				$atts['data-toggle'] = 'dropdown';
100
+				$atts['class'] = 'dropdown-toggle';
101
+				$atts['aria-haspopup'] = 'true';
102 102
 			} else {
103
-				$atts['href'] = ! empty( $item->url ) ? $item->url : '';
103
+				$atts['href'] = ! empty($item->url) ? $item->url : '';
104 104
 			}
105 105
 
106
-			$atts = apply_filters( 'nav_menu_link_attributes', $atts, $item, $args );
106
+			$atts = apply_filters('nav_menu_link_attributes', $atts, $item, $args);
107 107
 
108 108
 			$attributes = '';
109
-			foreach ( $atts as $attr => $value ) {
110
-				if ( ! empty( $value ) ) {
111
-					$value = ( 'href' === $attr ) ? esc_url( $value ) : esc_attr( $value );
109
+			foreach ($atts as $attr => $value) {
110
+				if ( ! empty($value)) {
111
+					$value = ('href' === $attr) ? esc_url($value) : esc_attr($value);
112 112
 					$attributes .= ' ' . $attr . '="' . $value . '"';
113 113
 				}
114 114
 			}
@@ -122,19 +122,19 @@  discard block
 block discarded – undo
122 122
 			 * if there is a value in the attr_title property. If the attr_title
123 123
 			 * property is NOT null we apply it as the class name for the glyphicon.
124 124
 			 */
125
-			if ( ! empty( $item->attr_title ) ) {
126
-				$item_output .= '<a'. $attributes .'"><span class="glyphicon ' . esc_attr( $item->attr_title ) . '"></span>&nbsp;';
125
+			if ( ! empty($item->attr_title)) {
126
+				$item_output .= '<a' . $attributes . '"><span class="glyphicon ' . esc_attr($item->attr_title) . '"></span>&nbsp;';
127 127
 			} else {
128
-				$item_output .= '<a'. $attributes .'>';
128
+				$item_output .= '<a' . $attributes . '>';
129 129
 			}
130 130
 
131
-			$item_output .= $args->link_before . apply_filters( 'the_title', $item->title, $item->ID ) . $args->link_after;
132
-			$item_output .= ( $args->has_children && 0 === $depth ) ? ' <span class="caret"></span></a>' : '</a>';
131
+			$item_output .= $args->link_before . apply_filters('the_title', $item->title, $item->ID) . $args->link_after;
132
+			$item_output .= ($args->has_children && 0 === $depth) ? ' <span class="caret"></span></a>' : '</a>';
133 133
 			$item_output .= $args->after;
134 134
 
135 135
 			
136 136
 			
137
-			$output .= apply_filters( 'walker_nav_menu_start_el', $item_output, $item, $depth, $args );
137
+			$output .= apply_filters('walker_nav_menu_start_el', $item_output, $item, $depth, $args);
138 138
 		}
139 139
 	}
140 140
   
@@ -158,17 +158,17 @@  discard block
 block discarded – undo
158 158
 	 * @param string $output Passed by reference. Used to append additional content.
159 159
 	 * @return null Null on failure with no changes to parameters.
160 160
 	 */
161
-	public function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output ) {
162
-        if ( ! $element )
161
+	public function display_element($element, &$children_elements, $max_depth, $depth, $args, &$output) {
162
+        if ( ! $element)
163 163
             return;
164 164
 
165 165
         $id_field = $this->db_fields['id'];
166 166
 
167 167
         // Display this element.
168
-        if ( is_object( $args[0] ) )
169
-           $args[0]->has_children = ! empty( $children_elements[ $element->$id_field ] );
168
+        if (is_object($args[0]))
169
+           $args[0]->has_children = ! empty($children_elements[$element->$id_field]);
170 170
 
171
-        parent::display_element( $element, $children_elements, $max_depth, $depth, $args, $output );
171
+        parent::display_element($element, $children_elements, $max_depth, $depth, $args, $output);
172 172
     }
173 173
 
174 174
 	/**
@@ -182,20 +182,20 @@  discard block
 block discarded – undo
182 182
 	 * @param array $args passed from the wp_nav_menu function.
183 183
 	 *
184 184
 	 */
185
-	public static function fallback( $args ) {
186
-		if ( current_user_can( 'manage_options' ) ) {
185
+	public static function fallback($args) {
186
+		if (current_user_can('manage_options')) {
187 187
 
188
-			extract( $args );
188
+			extract($args);
189 189
 
190 190
 			$fb_output = null;
191 191
 
192
-			if ( $container ) {
192
+			if ($container) {
193 193
 				$fb_output = '<' . $container;
194 194
 
195
-				if ( $container_id )
195
+				if ($container_id)
196 196
 					$fb_output .= ' id="' . $container_id . '"';
197 197
 
198
-				if ( $container_class )
198
+				if ($container_class)
199 199
 					$fb_output .= ' class="' . $container_class . '"';
200 200
 
201 201
 				$fb_output .= '>';
@@ -203,20 +203,20 @@  discard block
 block discarded – undo
203 203
 
204 204
 			$fb_output .= '<ul';
205 205
 
206
-			if ( $menu_id )
206
+			if ($menu_id)
207 207
 				$fb_output .= ' id="' . $menu_id . '"';
208 208
 
209
-			if ( $menu_class )
209
+			if ($menu_class)
210 210
 				$fb_output .= ' class="' . $menu_class . '"';
211 211
 
212 212
 			$fb_output .= '>';
213
-			$fb_output .= '<li><a href="' . admin_url( 'nav-menus.php' ) . '">'.__('Add a menu','lsx').'</a></li>';
213
+			$fb_output .= '<li><a href="' . admin_url('nav-menus.php') . '">' . __('Add a menu', 'lsx') . '</a></li>';
214 214
 			$fb_output .= '</ul>';
215 215
 
216
-			if ( $container )
216
+			if ($container)
217 217
 				$fb_output .= '</' . $container . '>';
218 218
 
219
-			echo wp_kses_post( $fb_output );
219
+			echo wp_kses_post($fb_output);
220 220
 		}
221 221
 	}
222 222
 }
@@ -225,9 +225,9 @@  discard block
 block discarded – undo
225 225
 /**
226 226
  * Add in our custom classes to the menus
227 227
  */
228
-function wpml_nav_language_switcher_fix( $items , $args ) {
229
-	$items = str_replace('menu-item-language-current','menu-item-language-current dropdown',$items);
230
-	$items = str_replace('submenu-languages','submenu-languages dropdown-menu',$items);
228
+function wpml_nav_language_switcher_fix($items, $args) {
229
+	$items = str_replace('menu-item-language-current', 'menu-item-language-current dropdown', $items);
230
+	$items = str_replace('submenu-languages', 'submenu-languages dropdown-menu', $items);
231 231
 	return $items;
232 232
 }
233
-add_filter( 'wp_nav_menu_items', 'wpml_nav_language_switcher_fix', 10, 2 );
233
+add_filter('wp_nav_menu_items', 'wpml_nav_language_switcher_fix', 10, 2);
Please login to merge, or discard this patch.
inc/template-tags.php 1 patch
Spacing   +165 added lines, -165 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( ! defined( 'ABSPATH' ) ) return; // Exit if accessed directly
2
+if ( ! defined('ABSPATH')) return; // Exit if accessed directly
3 3
 
4 4
 /**
5 5
  * Yoast Breadcrumbs on Twitter Bootstrap
@@ -10,21 +10,21 @@  discard block
 block discarded – undo
10 10
  * @param string $sep Your custom separator
11 11
  */
12 12
 function lsx_breadcrumbs() {
13
-  if (!function_exists('yoast_breadcrumb') && !function_exists('woocommerce_breadcrumb')) {
13
+  if ( ! function_exists('yoast_breadcrumb') && ! function_exists('woocommerce_breadcrumb')) {
14 14
     return null;
15 15
   }
16 16
   
17 17
   $show_on_front = get_option('show_on_front');
18
-  if ( ('posts' == $show_on_front && is_home()) || ('page' == $show_on_front && is_front_page()) ) {
18
+  if (('posts' == $show_on_front && is_home()) || ('page' == $show_on_front && is_front_page())) {
19 19
   	return;
20 20
   }
21 21
 
22
-  if(function_exists('woocommerce_breadcrumb')){
22
+  if (function_exists('woocommerce_breadcrumb')) {
23 23
   		ob_start();
24 24
   		woocommerce_breadcrumb();
25 25
   		$output = ob_get_clean();
26 26
   		$output = str_replace('woocommerce-breadcrumb', 'woocommerce-breadcrumb breadcrumbs-container', $output);
27
-  }elseif(function_exists('yoast_breadcrumb')){
27
+  }elseif (function_exists('yoast_breadcrumb')) {
28 28
 	  	// Default Yoast Breadcrumbs Separator
29 29
 	  	$old_sep = '\&raquo\;';
30 30
 	  	
@@ -42,11 +42,11 @@  discard block
 block discarded – undo
42 42
 	  	$output = '<div class="breadcrumbs-container">' . $output . '</div>';
43 43
   }
44 44
   
45
-  $output = apply_filters('lsx_breadcrumbs',$output);
45
+  $output = apply_filters('lsx_breadcrumbs', $output);
46 46
 
47
-  echo wp_kses_post( $output );
47
+  echo wp_kses_post($output);
48 48
 }
49
-add_action( 'lsx_content_top', 'lsx_breadcrumbs', 100 );
49
+add_action('lsx_content_top', 'lsx_breadcrumbs', 100);
50 50
 
51 51
 /**
52 52
  * Replaces the seperator with a blank space.
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 function lsx_breadcrumbs_seperator_filter($seperator) {
56 56
 	return '';
57 57
 }
58
-add_filter( 'wpseo_breadcrumb_separator', 'lsx_breadcrumbs_seperator_filter' );
58
+add_filter('wpseo_breadcrumb_separator', 'lsx_breadcrumbs_seperator_filter');
59 59
 
60 60
 /**
61 61
  * Custom template tags for this theme.
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
  *
64 64
  * @package lsx
65 65
  */
66
-if ( ! function_exists( 'lsx_site_title' ) ) :
66
+if ( ! function_exists('lsx_site_title')) :
67 67
 	/**
68 68
 	 * Displays logo when applicable
69 69
 	 *
@@ -72,8 +72,8 @@  discard block
 block discarded – undo
72 72
 	function lsx_site_title() {
73 73
 		?>
74 74
 			<div class="site-branding">
75
-				<h1 class="site-title"><a title="<?php bloginfo( 'name' ); ?>" href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
76
-				<p class="site-description"><?php bloginfo( 'description' ); ?></p>
75
+				<h1 class="site-title"><a title="<?php bloginfo('name'); ?>" href="<?php echo esc_url(home_url('/')); ?>" rel="home"><?php bloginfo('name'); ?></a></h1>
76
+				<p class="site-description"><?php bloginfo('description'); ?></p>
77 77
 			</div>		
78 78
 		<?php 
79 79
 	}
@@ -82,9 +82,9 @@  discard block
 block discarded – undo
82 82
 /**
83 83
  * Add customisable post meta.
84 84
  */
85
-if ( ! function_exists( 'lsx_post_meta' ) ) {
85
+if ( ! function_exists('lsx_post_meta')) {
86 86
 	function lsx_post_meta() {
87
-		if ( ( is_page() && ! ( is_home() || is_front_page() ) ) && ! is_page_template( 'page-templates/template-blog.php' ) ) {
87
+		if ((is_page() && ! (is_home() || is_front_page())) && ! is_page_template('page-templates/template-blog.php')) {
88 88
 			return;
89 89
 		}
90 90
 		?>
@@ -99,83 +99,83 @@  discard block
 block discarded – undo
99 99
 /**
100 100
  * Add customisable post meta: post date
101 101
  */
102
-if ( ! function_exists( 'lsx_post_meta_date' ) ) {
102
+if ( ! function_exists('lsx_post_meta_date')) {
103 103
 	function lsx_post_meta_date() {
104 104
 		$time_string = '<time class="entry-date published updated" datetime="%1$s">%2$s</time>';
105 105
 				
106
-		$time_string = sprintf( $time_string,
107
-			esc_attr( get_the_date( 'c' ) ),
106
+		$time_string = sprintf($time_string,
107
+			esc_attr(get_the_date('c')),
108 108
 			get_the_date(),
109
-			esc_attr( get_the_modified_date( 'c' ) ),
109
+			esc_attr(get_the_modified_date('c')),
110 110
 			get_the_modified_date()
111 111
 		);
112 112
 
113
-		printf( '<span class="post-meta-time"><span>%1$s</span> <a href="%2$s" rel="bookmark">%3$s</a></span>',
114
-			esc_html_x( 'Posted on:', 'Used before publish date.', 'lsx' ),
115
-			esc_url( get_permalink() ),
116
-			wp_kses_post( $time_string )
113
+		printf('<span class="post-meta-time"><span>%1$s</span> <a href="%2$s" rel="bookmark">%3$s</a></span>',
114
+			esc_html_x('Posted on:', 'Used before publish date.', 'lsx'),
115
+			esc_url(get_permalink()),
116
+			wp_kses_post($time_string)
117 117
 		);
118 118
 	}
119 119
 }
120
-add_action( 'lsx_content_post_meta', 'lsx_post_meta_date', 10 );
120
+add_action('lsx_content_post_meta', 'lsx_post_meta_date', 10);
121 121
 
122 122
 /**
123 123
  * Add customisable post meta: post author
124 124
  */
125
-if ( ! function_exists( 'lsx_post_meta_author' ) ) {
125
+if ( ! function_exists('lsx_post_meta_author')) {
126 126
 	function lsx_post_meta_author() {
127
-		printf( '<span class="post-meta-author"><span>%1$s</span> <a href="%2$s">%3$s</a></span>',
128
-			esc_html_x( 'Posted by:', 'Used before post author name.', 'lsx' ),
129
-			esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
127
+		printf('<span class="post-meta-author"><span>%1$s</span> <a href="%2$s">%3$s</a></span>',
128
+			esc_html_x('Posted by:', 'Used before post author name.', 'lsx'),
129
+			esc_url(get_author_posts_url(get_the_author_meta('ID'))),
130 130
 			get_the_author()
131 131
 		);
132 132
 	}
133 133
 }
134
-add_action( 'lsx_content_post_meta', 'lsx_post_meta_author', 20 );
134
+add_action('lsx_content_post_meta', 'lsx_post_meta_author', 20);
135 135
 
136 136
 /**
137 137
  * Add customisable post meta: post category(ies)
138 138
  */
139
-if ( ! function_exists( 'lsx_post_meta_category' ) ) {
139
+if ( ! function_exists('lsx_post_meta_category')) {
140 140
 	function lsx_post_meta_category() {
141
-		$post_categories = wp_get_post_categories( get_the_ID() );
141
+		$post_categories = wp_get_post_categories(get_the_ID());
142 142
 		$cats = array();
143 143
 
144
-		foreach( $post_categories as $c ) {
145
-			$cat = get_category( $c );
146
-			$cats[] = '<a href="' . get_category_link( $cat->term_id ) . '" title="' . sprintf( esc_html__( 'View all posts in %s' , 'lsx' ), $cat->name ) . '" ' . '>' . $cat->name . '</a>';
144
+		foreach ($post_categories as $c) {
145
+			$cat = get_category($c);
146
+			$cats[] = '<a href="' . get_category_link($cat->term_id) . '" title="' . sprintf(esc_html__('View all posts in %s', 'lsx'), $cat->name) . '" ' . '>' . $cat->name . '</a>';
147 147
 		}
148 148
 
149
-		if ( ! empty( $cats ) ) {
149
+		if ( ! empty($cats)) {
150 150
 			?>
151
-			<span class="post-meta-categories"><span><?php esc_html_e( 'Posted in:', 'lsx' ); ?></span> <?php echo wp_kses_post( implode( ', ', $cats ) ); ?></span>
151
+			<span class="post-meta-categories"><span><?php esc_html_e('Posted in:', 'lsx'); ?></span> <?php echo wp_kses_post(implode(', ', $cats)); ?></span>
152 152
 			<?php
153 153
 		}
154 154
 	}
155 155
 }
156
-add_action( 'lsx_content_post_meta', 'lsx_post_meta_category', 30 );
156
+add_action('lsx_content_post_meta', 'lsx_post_meta_category', 30);
157 157
 
158 158
 /**
159 159
  * Add customisable post meta: post tag(s)
160 160
  */
161
-if ( ! function_exists( 'lsx_post_tags' ) ) {
161
+if ( ! function_exists('lsx_post_tags')) {
162 162
 	function lsx_post_tags() {
163
-		if ( has_tag() ) :
163
+		if (has_tag()) :
164 164
 			?>
165 165
 			<div class="post-tags">
166
-				<span><?php esc_html_e( 'Tagged as:', 'lsx' ); ?></span> <?php echo wp_kses_post( get_the_tag_list( '' ) ); ?>
166
+				<span><?php esc_html_e('Tagged as:', 'lsx'); ?></span> <?php echo wp_kses_post(get_the_tag_list('')); ?>
167 167
 			</div>
168 168
 			<?php
169 169
 		endif;
170 170
 	}
171 171
 }
172
-add_action( 'lsx_content_post_tags', 'lsx_post_tags', 10 );
172
+add_action('lsx_content_post_tags', 'lsx_post_tags', 10);
173 173
 
174 174
 /**
175 175
  * Add customisable post info: related posts
176 176
  */
177 177
 function lsx_related_posts() {
178
-	if ( is_singular( 'post' ) && class_exists( 'Jetpack_RelatedPosts' ) ) {
178
+	if (is_singular('post') && class_exists('Jetpack_RelatedPosts')) {
179 179
 		?>
180 180
 			<div class="row row-related-posts">
181 181
 				<div class="col-md-12">
@@ -185,15 +185,15 @@  discard block
 block discarded – undo
185 185
 		<?php
186 186
 	}
187 187
 }
188
-add_action( 'lsx_entry_bottom', 'lsx_related_posts', 10 );
188
+add_action('lsx_entry_bottom', 'lsx_related_posts', 10);
189 189
 
190 190
 /**
191 191
  * Translate post format to Font Awesome class
192 192
  */
193 193
 
194
-if ( ! function_exists( 'lsx_translate_format_to_fontawesome' ) ) {
195
-	function lsx_translate_format_to_fontawesome( $format ) {
196
-		switch ( $format ) {
194
+if ( ! function_exists('lsx_translate_format_to_fontawesome')) {
195
+	function lsx_translate_format_to_fontawesome($format) {
196
+		switch ($format) {
197 197
 			case 'image':
198 198
 				$format = 'camera';
199 199
 				break;
@@ -238,45 +238,45 @@  discard block
 block discarded – undo
238 238
  * to be added/modified where necessary.
239 239
  */
240 240
 
241
-if ( ! function_exists( 'lsx_portfolio_meta' ) ) {
241
+if ( ! function_exists('lsx_portfolio_meta')) {
242 242
 	function lsx_portfolio_meta() {
243 243
 		?>
244 244
 		<div id="portfolio-meta" class="portfolio-meta info-box-sticky info-box sticky-wrapper">
245 245
 			<?php 
246
-				$client = get_post_meta(get_the_ID(),'lsx-client',true);
247
-				if(false != $client){ ?>
246
+				$client = get_post_meta(get_the_ID(), 'lsx-client', true);
247
+				if (false != $client) { ?>
248 248
 					<div class="portfolio-client">
249
-						<span><span class="fa fa-user"></span><?php esc_html_e( 'Client','lsx' ); ?></span>
250
-						<span><?php echo esc_html( $client ); ?></span>
249
+						<span><span class="fa fa-user"></span><?php esc_html_e('Client', 'lsx'); ?></span>
250
+						<span><?php echo esc_html($client); ?></span>
251 251
 					</div>				
252 252
 			<?php }	?>
253 253
 
254 254
 			<?php 
255
-				$portfolio_type = get_the_term_list( get_the_ID(), 'jetpack-portfolio-type', '', ', ', '' );
255
+				$portfolio_type = get_the_term_list(get_the_ID(), 'jetpack-portfolio-type', '', ', ', '');
256 256
 				
257
-				if($portfolio_type){
257
+				if ($portfolio_type) {
258 258
 					?>
259 259
 					<div class="portfolio-industry">
260
-						<span><span class="fa fa-folder-open"></span><?php esc_html_e( 'Industry', 'lsx' ); ?></span>
261
-						<?php echo wp_kses_post( $portfolio_type ); ?>
260
+						<span><span class="fa fa-folder-open"></span><?php esc_html_e('Industry', 'lsx'); ?></span>
261
+						<?php echo wp_kses_post($portfolio_type); ?>
262 262
 					</div>			
263 263
 			<?php } ?>
264 264
 
265 265
 			<?php 
266
-				$services = get_the_term_list( get_the_ID(), 'jetpack-portfolio-tag', '', ', ', '' );
267
-				if(false != $services){ ?>
266
+				$services = get_the_term_list(get_the_ID(), 'jetpack-portfolio-tag', '', ', ', '');
267
+				if (false != $services) { ?>
268 268
 					<div class="portfolio-services">
269
-						<span><span class="fa fa-cog"></span><?php esc_html_e( 'Services', 'lsx' ); ?></span>
270
-						<?php echo wp_kses_post( $services ); ?>
269
+						<span><span class="fa fa-cog"></span><?php esc_html_e('Services', 'lsx'); ?></span>
270
+						<?php echo wp_kses_post($services); ?>
271 271
 					</div>				
272 272
 			<?php }	?>
273 273
 
274 274
 			<?php 
275
-				$website = esc_url( get_post_meta(get_the_ID(),'lsx-website',true) );
276
-				if(false != $website){ ?>
275
+				$website = esc_url(get_post_meta(get_the_ID(), 'lsx-website', true));
276
+				if (false != $website) { ?>
277 277
 					<div class="portfolio-website">
278
-						<span><span class="fa fa-link"></span><?php esc_html_e( 'Website', 'lsx' ); ?></span>
279
-						<a target="_blank" href="<?php echo esc_url( $website ); ?>"><?php echo esc_html( $website ) ?></a>
278
+						<span><span class="fa fa-link"></span><?php esc_html_e('Website', 'lsx'); ?></span>
279
+						<a target="_blank" href="<?php echo esc_url($website); ?>"><?php echo esc_html($website) ?></a>
280 280
 					</div>				
281 281
 			<?php }	?>
282 282
 
@@ -290,29 +290,29 @@  discard block
 block discarded – undo
290 290
  *
291 291
  */
292 292
 
293
-if ( ! function_exists( 'lsx_portfolio_gallery' ) ) {
293
+if ( ! function_exists('lsx_portfolio_gallery')) {
294 294
 	function lsx_portfolio_gallery() {
295 295
 
296
-		$media = get_attached_media( 'image' );
296
+		$media = get_attached_media('image');
297 297
 		$media_array = array();
298 298
 		$post_thumbnail_id = get_post_thumbnail_id(get_the_ID());
299 299
 		
300
-		if(!empty($media)){
301
-			foreach($media as $media_item){
302
-				if($post_thumbnail_id != $media_item->ID) {
300
+		if ( ! empty($media)) {
301
+			foreach ($media as $media_item) {
302
+				if ($post_thumbnail_id != $media_item->ID) {
303 303
 					$media_array[] = $media_item->ID;
304 304
 				}
305 305
 			}
306 306
 				
307
-			if(!empty($media_array)){
308
-				echo wp_kses_post( gallery_shortcode( array( 'size' => 'full', 'ids' => implode( ',', $media_array ) ) ) );
307
+			if ( ! empty($media_array)) {
308
+				echo wp_kses_post(gallery_shortcode(array('size' => 'full', 'ids' => implode(',', $media_array))));
309 309
 			}
310 310
 		}
311 311
 		
312 312
 	}
313 313
 }
314 314
 
315
-if ( ! function_exists( 'lsx_paging_nav' ) ) :
315
+if ( ! function_exists('lsx_paging_nav')) :
316 316
 	/**
317 317
 	 * Display navigation to next/previous set of posts when applicable.
318 318
 	 *
@@ -320,35 +320,35 @@  discard block
 block discarded – undo
320 320
 	 */
321 321
 	function lsx_paging_nav() {
322 322
 		// Don't print empty markup if there's only one page.
323
-		if ( $GLOBALS['wp_query']->max_num_pages < 2 ) {
323
+		if ($GLOBALS['wp_query']->max_num_pages < 2) {
324 324
 			return;
325 325
 		}
326 326
 		
327
-		if(current_theme_supports('infinite-scroll') && class_exists('The_Neverending_Home_Page')){
327
+		if (current_theme_supports('infinite-scroll') && class_exists('The_Neverending_Home_Page')) {
328 328
 			return true;
329
-		}elseif(function_exists('wp_pagenavi')){
329
+		}elseif (function_exists('wp_pagenavi')) {
330 330
 			wp_pagenavi();
331
-		}else{
331
+		} else {
332 332
 			
333 333
 			$labels = array(
334
-				'next' 		=> '<span class="meta-nav">&larr;</span> '.__( 'Older posts', 'lsx' ),
335
-				'previous' 	=> __( 'Newer posts', 'lsx' ).' <span class="meta-nav">&rarr;</span>',
336
-				'title' 	=> __( 'Posts navigation', 'lsx' )
334
+				'next' 		=> '<span class="meta-nav">&larr;</span> ' . __('Older posts', 'lsx'),
335
+				'previous' 	=> __('Newer posts', 'lsx') . ' <span class="meta-nav">&rarr;</span>',
336
+				'title' 	=> __('Posts navigation', 'lsx')
337 337
 			);
338
-			$labels = apply_filters('lsx_post_navigation_labels',$labels);
338
+			$labels = apply_filters('lsx_post_navigation_labels', $labels);
339 339
 			
340 340
 			extract($labels);
341 341
 			?>
342 342
 			<nav class="navigation paging-navigation" role="navigation">
343 343
 				<div class="lsx-breaker"></div>
344
-				<h1 class="screen-reader-text"><?php echo esc_html( $title ); ?></h1>
344
+				<h1 class="screen-reader-text"><?php echo esc_html($title); ?></h1>
345 345
 				<div class="nav-links">
346
-					<?php if ( get_next_posts_link() ) : ?>
347
-					<div class="nav-previous"><?php next_posts_link( $next ); ?></div>
346
+					<?php if (get_next_posts_link()) : ?>
347
+					<div class="nav-previous"><?php next_posts_link($next); ?></div>
348 348
 					<?php endif; ?>
349 349
 		
350
-					<?php if ( get_previous_posts_link() ) : ?>
351
-					<div class="nav-next"><?php previous_posts_link( $previous ); ?></div>
350
+					<?php if (get_previous_posts_link()) : ?>
351
+					<div class="nav-next"><?php previous_posts_link($previous); ?></div>
352 352
 					<?php endif; ?>
353 353
 					
354 354
 					<div class="clearfix"></div>
@@ -359,7 +359,7 @@  discard block
 block discarded – undo
359 359
 	}
360 360
 endif;
361 361
 
362
-if ( ! function_exists( 'lsx_post_nav' ) ) :
362
+if ( ! function_exists('lsx_post_nav')) :
363 363
 /**
364 364
  * Display navigation to next/previous post when applicable.
365 365
  *
@@ -367,10 +367,10 @@  discard block
 block discarded – undo
367 367
  */
368 368
 function lsx_post_nav() {
369 369
 	// Don't print empty markup if there's nowhere to navigate.
370
-	$previous = ( is_attachment() ) ? get_post( get_post()->post_parent ) : get_adjacent_post( false, '', true );
371
-	$next     = get_adjacent_post( false, '', false );
370
+	$previous = (is_attachment()) ? get_post(get_post()->post_parent) : get_adjacent_post(false, '', true);
371
+	$next     = get_adjacent_post(false, '', false);
372 372
 
373
-	if ( ! $next && ! $previous ) {
373
+	if ( ! $next && ! $previous) {
374 374
 		return;
375 375
 	}
376 376
 	?>
@@ -380,14 +380,14 @@  discard block
 block discarded – undo
380 380
 		<div class="nav-links pager row">
381 381
 
382 382
 			<?php
383
-				$previous_post = get_previous_post_link( '%link', '<div class="previous col-md-6"><p class="nav-links-description">'._x( 'Previous Post', 'Previous post link', 'lsx' ).'</p><h3>%title</h3></div>' );
384
-				$previous_post = str_replace('<a','<a',$previous_post);
385
-				echo wp_kses_post( $previous_post );
383
+				$previous_post = get_previous_post_link('%link', '<div class="previous col-md-6"><p class="nav-links-description">' . _x('Previous Post', 'Previous post link', 'lsx') . '</p><h3>%title</h3></div>');
384
+				$previous_post = str_replace('<a', '<a', $previous_post);
385
+				echo wp_kses_post($previous_post);
386 386
 			?>
387 387
 			<?php
388
-				$next_post = get_next_post_link( '%link', '<div class="next col-md-6"><p class="nav-links-description">'._x( 'Next Post', 'Next post link', 'lsx' ).'</p><h3>%title</h3></div>' );
389
-				$next_post = str_replace('<a','<a',$next_post);
390
-				echo wp_kses_post( $next_post );
388
+				$next_post = get_next_post_link('%link', '<div class="next col-md-6"><p class="nav-links-description">' . _x('Next Post', 'Next post link', 'lsx') . '</p><h3>%title</h3></div>');
389
+				$next_post = str_replace('<a', '<a', $next_post);
390
+				echo wp_kses_post($next_post);
391 391
 			?>
392 392
 
393 393
 		</div><!-- .nav-links -->
@@ -403,16 +403,16 @@  discard block
 block discarded – undo
403 403
  * @subpackage	template-tags
404 404
  * @category	header
405 405
  */
406
-if(!function_exists('lsx_site_identity')){
407
-	function lsx_site_identity(){
406
+if ( ! function_exists('lsx_site_identity')) {
407
+	function lsx_site_identity() {
408 408
 
409
-		if ( function_exists('has_custom_logo') && has_custom_logo() ) {
409
+		if (function_exists('has_custom_logo') && has_custom_logo()) {
410 410
 			the_custom_logo();
411
-		}elseif ( function_exists( 'jetpack_has_site_logo' ) && jetpack_has_site_logo() ) {
411
+		}elseif (function_exists('jetpack_has_site_logo') && jetpack_has_site_logo()) {
412 412
 			jetpack_the_site_logo();
413
-		}else{
413
+		} else {
414 414
 			// shouldn't show both together.. its just strange
415
-			if(true == get_theme_mod('site_logo_header_text',1)){
415
+			if (true == get_theme_mod('site_logo_header_text', 1)) {
416 416
 				lsx_site_title();
417 417
 			}
418 418
 		}
@@ -427,17 +427,17 @@  discard block
 block discarded – undo
427 427
  * @subpackage	template-tags
428 428
  * @category	navigation
429 429
  */
430
-if(!function_exists('lsx_navbar_header')){
431
-	function lsx_navbar_header(){ ?>
430
+if ( ! function_exists('lsx_navbar_header')) {
431
+	function lsx_navbar_header() { ?>
432 432
 	   	<div class="navbar-header" itemscope itemtype="http://schema.org/WebPage">
433 433
 	   	
434 434
 	   		<?php 
435
-	   		$nav_menu = get_theme_mod('nav_menu_locations',false);
435
+	   		$nav_menu = get_theme_mod('nav_menu_locations', false);
436 436
 			//print_r(get_nav_menu_locations());
437 437
 
438
-	   		if(false != $nav_menu && isset($nav_menu['primary']) && 0 != $nav_menu['primary']){ ?>
438
+	   		if (false != $nav_menu && isset($nav_menu['primary']) && 0 != $nav_menu['primary']) { ?>
439 439
 		   		<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".primary-navbar">
440
-		        	<span class="sr-only"><?php esc_html_e( 'Toggle navigation', 'lsx' ); ?></span>
440
+		        	<span class="sr-only"><?php esc_html_e('Toggle navigation', 'lsx'); ?></span>
441 441
 		        	<span class="icon-bar"></span>
442 442
 		        	<span class="icon-bar"></span>
443 443
 		        	<span class="icon-bar"></span>
@@ -449,7 +449,7 @@  discard block
 block discarded – undo
449 449
 	<?php }
450 450
 }
451 451
 //the if statement is for backwards compatability with previous versions of the theme.
452
-add_action('lsx_nav_before','lsx_navbar_header');
452
+add_action('lsx_nav_before', 'lsx_navbar_header');
453 453
 
454 454
 /**
455 455
  * Outputs the Nav Menu
@@ -458,16 +458,16 @@  discard block
 block discarded – undo
458 458
  * @subpackage	template-tags
459 459
  * @category	navigation
460 460
  */
461
-if(!function_exists('lsx_nav_menu')){
462
-	function lsx_nav_menu(){
463
-		$nav_menu = get_theme_mod('nav_menu_locations',false);
461
+if ( ! function_exists('lsx_nav_menu')) {
462
+	function lsx_nav_menu() {
463
+		$nav_menu = get_theme_mod('nav_menu_locations', false);
464 464
 		
465 465
 		//print_r(get_nav_menu_locations());
466 466
 
467
-	    if(false != $nav_menu && isset($nav_menu['primary']) && 0 != $nav_menu['primary']){ ?>
467
+	    if (false != $nav_menu && isset($nav_menu['primary']) && 0 != $nav_menu['primary']) { ?>
468 468
 			<nav class="primary-navbar collapse navbar-collapse">
469 469
 		    	<?php
470
-				wp_nav_menu( array(
470
+				wp_nav_menu(array(
471 471
 					'theme_location' => 'primary',
472 472
 					'menu' => $nav_menu['primary'],
473 473
 					'depth' => 3,
@@ -477,9 +477,9 @@  discard block
 block discarded – undo
477 477
 				);
478 478
 				?>
479 479
 		   		</nav>
480
-	    <?php } elseif(is_customize_preview()) { ?>
480
+	    <?php } elseif (is_customize_preview()) { ?>
481 481
 	    		<nav class="primary-navbar collapse navbar-collapse">
482
-	    			<div class="alert alert-info" role="alert"><?php esc_html_e( 'Create a menu and assign it here via the "Navigation" panel.', 'lsx' );?></div>
482
+	    			<div class="alert alert-info" role="alert"><?php esc_html_e('Create a menu and assign it here via the "Navigation" panel.', 'lsx'); ?></div>
483 483
 	    		</nav>
484 484
 	    </div>
485 485
 	  	<?php }
@@ -493,9 +493,9 @@  discard block
 block discarded – undo
493 493
  * @subpackage	template-tags
494 494
  * @category	sitemap
495 495
  */
496
-function lsx_sitemap_pages(){
496
+function lsx_sitemap_pages() {
497 497
 	$posts_per_page = get_option('posts_per_page');
498
-	if(false == $posts_per_page){
498
+	if (false == $posts_per_page) {
499 499
 		$posts_per_page = 10;
500 500
 	}
501 501
 	
@@ -506,13 +506,13 @@  discard block
 block discarded – undo
506 506
 		'post_type'		=>	'page',
507 507
 	);
508 508
 	$pages = new WP_Query($page_args);
509
-	if($pages->have_posts()){
509
+	if ($pages->have_posts()) {
510 510
 
511
-		echo '<h2>' . esc_html__( 'Pages', 'lsx' ) . '</h2>';
511
+		echo '<h2>' . esc_html__('Pages', 'lsx') . '</h2>';
512 512
 
513 513
 		echo '<ul>';
514
-		while($pages->have_posts()){ $pages->the_post();
515
-			echo '<li class="page_item page-item-' . esc_attr( get_the_ID() ) . '"><a href="' . esc_url( get_permalink() ) . '" title="">' . get_the_title() . '</a></li>';
514
+		while ($pages->have_posts()) { $pages->the_post();
515
+			echo '<li class="page_item page-item-' . esc_attr(get_the_ID()) . '"><a href="' . esc_url(get_permalink()) . '" title="">' . get_the_title() . '</a></li>';
516 516
 		}
517 517
 		echo '</ul>';
518 518
 		
@@ -527,10 +527,10 @@  discard block
 block discarded – undo
527 527
  * @subpackage	template-tags
528 528
  * @category	sitemap
529 529
  */
530
-function lsx_sitemap_custom_post_type(){
530
+function lsx_sitemap_custom_post_type() {
531 531
 	
532 532
 	$posts_per_page = get_option('posts_per_page');
533
-	if(false == $posts_per_page){
533
+	if (false == $posts_per_page) {
534 534
 		$posts_per_page = 10;
535 535
 	}
536 536
 	
@@ -538,8 +538,8 @@  discard block
 block discarded – undo
538 538
 			'public'				=> true,
539 539
 			'_builtin' 				=> false
540 540
 	);
541
-	$post_types = get_post_types($args , 'names');
542
-	foreach($post_types as $post_type){	
541
+	$post_types = get_post_types($args, 'names');
542
+	foreach ($post_types as $post_type) {	
543 543
 
544 544
 		$post_type_args = array(
545 545
 				'post_type'		=>	'page',
@@ -550,19 +550,19 @@  discard block
 block discarded – undo
550 550
 		$post_type_items = new WP_Query($post_type_args);
551 551
 		
552 552
 		$post_type_object = get_post_type_object($post_type);
553
-		if(null != $post_type_object){
553
+		if (null != $post_type_object) {
554 554
 			$title = $post_type_object->labels->name;
555
-		}else{
555
+		} else {
556 556
 			$title = ucwords($post_type);
557 557
 		}
558 558
 		
559
-		if($post_type_items->have_posts()){
559
+		if ($post_type_items->have_posts()) {
560 560
 	
561
-			printf( '<h2>' . esc_html__( '%1$s', 'lsx' ) . '</h2>', esc_html( $title ) );
561
+			printf('<h2>' . esc_html__('%1$s', 'lsx') . '</h2>', esc_html($title));
562 562
 	
563 563
 			echo '<ul>';
564
-			while($post_type_items->have_posts()){ $post_type_items->the_post();
565
-				echo '<li class="' . esc_attr( get_post_type() ) . '_item ' . esc_attr( get_post_type() ) . '-item-' . esc_attr( get_the_ID() ) . '"><a href="' . esc_url( get_permalink() ) . '" title="">' . get_the_title() . '</a></li>';
564
+			while ($post_type_items->have_posts()) { $post_type_items->the_post();
565
+				echo '<li class="' . esc_attr(get_post_type()) . '_item ' . esc_attr(get_post_type()) . '-item-' . esc_attr(get_the_ID()) . '"><a href="' . esc_url(get_permalink()) . '" title="">' . get_the_title() . '</a></li>';
566 566
 			}
567 567
 			echo '</ul>';
568 568
 	
@@ -578,20 +578,20 @@  discard block
 block discarded – undo
578 578
  * @subpackage	template-tags
579 579
  * @category	sitemap
580 580
  */
581
-function lsx_sitemap_taxonomy_clouds(){
581
+function lsx_sitemap_taxonomy_clouds() {
582 582
 
583
-		$taxonomy_args =  array(
583
+		$taxonomy_args = array(
584 584
 			'public'				=> true,
585 585
 			'_builtin' 				=> false
586 586
 		);
587 587
 		$taxonomies = get_taxonomies($taxonomy_args);
588
-		if(!empty($taxonomies)){
589
-			foreach($taxonomies as $taxonomy_id => $taxonomy) {
588
+		if ( ! empty($taxonomies)) {
589
+			foreach ($taxonomies as $taxonomy_id => $taxonomy) {
590 590
 
591
-				$tag_cloud = wp_tag_cloud(array('taxonomy'=>$taxonomy_id,'echo'=>false));
592
-				if(null != $tag_cloud){
593
-					printf( '<h2>' . esc_html__( '%1$s', 'lsx' ) . '</h2>', esc_html( $taxonomy ) );
594
-					echo '<aside id="' . esc_attr( $taxonomy_id ) . '" class="widget widget_' . esc_attr( $taxonomy_id ) . '">' . esc_html( $tag_cloud ) . '</aside>';
591
+				$tag_cloud = wp_tag_cloud(array('taxonomy'=>$taxonomy_id, 'echo'=>false));
592
+				if (null != $tag_cloud) {
593
+					printf('<h2>' . esc_html__('%1$s', 'lsx') . '</h2>', esc_html($taxonomy));
594
+					echo '<aside id="' . esc_attr($taxonomy_id) . '" class="widget widget_' . esc_attr($taxonomy_id) . '">' . esc_html($tag_cloud) . '</aside>';
595 595
 		        }
596 596
 	        }
597 597
         } 
@@ -604,15 +604,15 @@  discard block
 block discarded – undo
604 604
  * @subpackage	hooks
605 605
  * @category	forms
606 606
  */
607
-add_action( 'lsx_footer_before', 'lsx_footer_subscription_cta', 10 );
607
+add_action('lsx_footer_before', 'lsx_footer_subscription_cta', 10);
608 608
 function lsx_footer_subscription_cta() {
609
-	if(!function_exists('lsx_is_form_enabled')){ return; }
609
+	if ( ! function_exists('lsx_is_form_enabled')) { return; }
610 610
 	$subscribe_form_id = lsx_is_form_enabled('subscribe');
611
-	if(false == $subscribe_form_id) { return; }
611
+	if (false == $subscribe_form_id) { return; }
612 612
 
613 613
 	//add Caldera Forms Fields Scripts
614
-	if( defined( 'CFCORE_VER' ) ){
615
-		wp_enqueue_script( 'cf-frontend-fields', CFCORE_URL . 'assets/js/fields.min.js', array('jquery'), CFCORE_VER );
614
+	if (defined('CFCORE_VER')) {
615
+		wp_enqueue_script('cf-frontend-fields', CFCORE_URL . 'assets/js/fields.min.js', array('jquery'), CFCORE_VER);
616 616
 	}
617 617
 
618 618
 	?>
@@ -620,8 +620,8 @@  discard block
 block discarded – undo
620 620
 		<div class="container">
621 621
 			<div class="row">
622 622
 				<div class="col-md-12">
623
-					<h2><?php esc_html_e( 'Subscribe to Our Newsletter', 'lsx' ); ?></h2>
624
-					<?php echo do_shortcode( '[caldera_form id="'.$subscribe_form_id.'"]' ); ?>
623
+					<h2><?php esc_html_e('Subscribe to Our Newsletter', 'lsx'); ?></h2>
624
+					<?php echo do_shortcode('[caldera_form id="' . $subscribe_form_id . '"]'); ?>
625 625
 				</div>
626 626
 			</div>
627 627
 		</div>
@@ -636,14 +636,14 @@  discard block
 block discarded – undo
636 636
  * @subpackage	hooks
637 637
  * @category	menu
638 638
  */
639
-add_action( 'lsx_header_top', 'lsx_add_top_menu' );
639
+add_action('lsx_header_top', 'lsx_add_top_menu');
640 640
 function lsx_add_top_menu() {
641 641
 	if (has_nav_menu('top-menu')) { ?>
642 642
 		<div id="top-menu" class="<?php lsx_top_menu_classes(); ?>">
643 643
 			<div class="container">
644 644
 				<nav class="top-menu">
645 645
 		    		<?php
646
-		    			wp_nav_menu( array(
646
+		    			wp_nav_menu(array(
647 647
 							'theme_location' => 'top-menu',
648 648
 							'walker' => new Lsx_Bootstrap_Navwalker())
649 649
 						);
@@ -661,24 +661,24 @@  discard block
 block discarded – undo
661 661
  * @subpackage	template-tag
662 662
  * @category 	forms
663 663
  */
664
-if ( class_exists('Caldera_Forms') && !function_exists( 'lsx_is_form_enabled' ) ) {
664
+if (class_exists('Caldera_Forms') && ! function_exists('lsx_is_form_enabled')) {
665 665
 	function lsx_is_form_enabled($slug = false) {
666
-		if(false == $slug){ return false; }
666
+		if (false == $slug) { return false; }
667 667
 	
668 668
 		$match = false;
669
-		$forms = get_option( '_caldera_forms' , false );
670
-		if(false !== $forms ) {
671
-			foreach($forms as $form_id=>$form_maybe){
672
-				if( trim(strtolower($slug)) == strtolower($form_maybe['name']) ){
669
+		$forms = get_option('_caldera_forms', false);
670
+		if (false !== $forms) {
671
+			foreach ($forms as $form_id=>$form_maybe) {
672
+				if (trim(strtolower($slug)) == strtolower($form_maybe['name'])) {
673 673
 					$match = $form_id;
674 674
 					break;
675 675
 				}
676 676
 			}
677 677
 		}
678
-		if( false === $match ){
679
-			$is_form = Caldera_Forms::get_form( strtolower( $slug ) );
680
-			if( !empty( $is_form ) ){
681
-				return strtolower( $slug );
678
+		if (false === $match) {
679
+			$is_form = Caldera_Forms::get_form(strtolower($slug));
680
+			if ( ! empty($is_form)) {
681
+				return strtolower($slug);
682 682
 			}
683 683
 		}
684 684
 	
@@ -694,10 +694,10 @@  discard block
 block discarded – undo
694 694
  * @category 	urls
695 695
  */
696 696
 function lsx_get_my_url() {
697
-	if ( ! preg_match( '/<a\s[^>]*?href=[\'"](.+?)[\'"]/is', get_the_content(), $matches ) )
697
+	if ( ! preg_match('/<a\s[^>]*?href=[\'"](.+?)[\'"]/is', get_the_content(), $matches))
698 698
 		return false;
699 699
 
700
-	return esc_url_raw( $matches[1] );
700
+	return esc_url_raw($matches[1]);
701 701
 }
702 702
 
703 703
 /**
@@ -707,19 +707,19 @@  discard block
 block discarded – undo
707 707
  * @subpackage 	extras
708 708
  * @category 	urls
709 709
  */
710
-function lsx_get_template_part($slug,$part) {
710
+function lsx_get_template_part($slug, $part) {
711 711
 	$template = array();
712 712
 	$part = (string) $part;
713
-	if ( '' !== $part ){
713
+	if ('' !== $part) {
714 714
 		$template = "{$slug}-{$part}.php";
715
-	}else{
715
+	} else {
716 716
 		$template = "{$slug}.php";
717 717
 	}
718
-	$file_path = apply_filters('lsx_content_path',false,$slug,$part);
718
+	$file_path = apply_filters('lsx_content_path', false, $slug, $part);
719 719
 
720
-	if ( false !== $file_path && '' == locate_template( array( $template ) ) && file_exists( $file_path.$template) ) {
721
-		load_template( $file_path.$template, false );
722
-	}else{
723
-		get_template_part($slug,$part);
720
+	if (false !== $file_path && '' == locate_template(array($template)) && file_exists($file_path . $template)) {
721
+		load_template($file_path . $template, false);
722
+	} else {
723
+		get_template_part($slug, $part);
724 724
 	}
725 725
 }
726 726
\ No newline at end of file
Please login to merge, or discard this patch.
sidebar.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -6,8 +6,8 @@  discard block
 block discarded – undo
6 6
  */
7 7
 
8 8
 // Allow Plugins and themes to disable the sidebar incase of very customized layouts.
9
-$sidebar_enabled = apply_filters('lsx_sidebar_enable',true);
10
-if(true !== $sidebar_enabled){return true;}
9
+$sidebar_enabled = apply_filters('lsx_sidebar_enable', true);
10
+if (true !== $sidebar_enabled) {return true; }
11 11
 ?>
12 12
 <?php
13 13
 	$show_on_front = get_option('show_on_front');
@@ -17,16 +17,16 @@  discard block
 block discarded – undo
17 17
 		$sidebar = 'home';
18 18
 	} else {
19 19
 
20
-		$layout = get_theme_mod('lsx_layout','2cr');
21
-		$layout = apply_filters( 'lsx_layout', $layout );
20
+		$layout = get_theme_mod('lsx_layout', '2cr');
21
+		$layout = apply_filters('lsx_layout', $layout);
22 22
 		
23
-		if('posts' == $show_on_front && is_home()){
23
+		if ('posts' == $show_on_front && is_home()) {
24 24
 			$sidebar = 'home';
25
-		}else{
25
+		} else {
26 26
 			$sidebar = 'sidebar-1';
27 27
 		}
28 28
 	}
29
-	if ( $layout !== '1c' ) : ?>
29
+	if ($layout !== '1c') : ?>
30 30
 
31 31
 	<?php lsx_sidebars_before(); ?>
32 32
 
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 	
35 35
 		<div id="secondary" class="widget-area <?php echo esc_attr(lsx_home_sidebar_class()); ?>" role="complementary">
36 36
 		
37
-	<?php elseif ( is_page_template('page-templates/template-blog.php') ) : ?>
37
+	<?php elseif (is_page_template('page-templates/template-blog.php')) : ?>
38 38
 	
39 39
 		<div id="secondary" class="widget-area <?php echo esc_attr(lsx_sidebar_class()); ?>" role="complementary">
40 40
 		
@@ -42,25 +42,25 @@  discard block
 block discarded – undo
42 42
 	
43 43
 		<div id="secondary" class="widget-area <?php echo esc_attr(lsx_sidebar_class()); ?>" role="complementary">
44 44
 		
45
-	<?php endif ; ?>
45
+	<?php endif; ?>
46 46
 
47 47
 		<?php lsx_sidebar_top(); ?>
48 48
 
49
-		<?php if ( ! dynamic_sidebar( $sidebar ) ) : ?>
49
+		<?php if ( ! dynamic_sidebar($sidebar)) : ?>
50 50
 
51 51
 			<aside id="search" class="widget widget_search">
52 52
 				<?php get_search_form(); ?>
53 53
 			</aside>
54 54
 
55 55
 			<aside id="archives" class="widget">
56
-				<h1 class="widget-title"><?php esc_attr_e( 'Archives', 'lsx' ); ?></h1>
56
+				<h1 class="widget-title"><?php esc_attr_e('Archives', 'lsx'); ?></h1>
57 57
 				<ul>
58
-					<?php wp_get_archives( array( 'type' => 'monthly' ) ); ?>
58
+					<?php wp_get_archives(array('type' => 'monthly')); ?>
59 59
 				</ul>
60 60
 			</aside>
61 61
 
62 62
 			<aside id="meta" class="widget">
63
-				<h1 class="widget-title"><?php esc_attr_e( 'Meta', 'lsx' ); ?></h1>
63
+				<h1 class="widget-title"><?php esc_attr_e('Meta', 'lsx'); ?></h1>
64 64
 				<ul>
65 65
 					<?php wp_register(); ?>
66 66
 					<li><?php wp_loginout(); ?></li>
Please login to merge, or discard this patch.
searchform.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -8,19 +8,19 @@
 block discarded – undo
8 8
 // This is to help the customizer function better
9 9
 $style = '';
10 10
 
11
-if ( is_customize_preview() ) {
12
-	$search_form = get_theme_mod( 'lsx_header_search', 0 );
11
+if (is_customize_preview()) {
12
+	$search_form = get_theme_mod('lsx_header_search', 0);
13 13
 	
14
-	if ( ! $search_form ) {
14
+	if ( ! $search_form) {
15 15
 		$style = 'display:none;';
16 16
 	}
17 17
 }
18 18
 ?>
19 19
 
20
-<form role="search" method="get" style="<?php echo esc_attr( $style ); ?>" class="search-form form-inline" id="searchform" action="<?php echo esc_url( home_url( '/' ) ); ?>">
20
+<form role="search" method="get" style="<?php echo esc_attr($style); ?>" class="search-form form-inline" id="searchform" action="<?php echo esc_url(home_url('/')); ?>">
21 21
 	<div class="input-group">
22
-		<input type="search" value="<?php if (is_search()) { echo get_search_query(); } ?>" name="s" class="search-field form-control" placeholder="<?php esc_attr_e( 'Search', 'lsx' ); ?> <?php echo esc_attr( get_bloginfo( 'name' ) ); ?>">
23
-		<label class="hide"><?php esc_attr_e( 'Search for:', 'lsx' ); ?></label>
22
+		<input type="search" value="<?php if (is_search()) { echo get_search_query(); } ?>" name="s" class="search-field form-control" placeholder="<?php esc_attr_e('Search', 'lsx'); ?> <?php echo esc_attr(get_bloginfo('name')); ?>">
23
+		<label class="hide"><?php esc_attr_e('Search for:', 'lsx'); ?></label>
24 24
 		<span class="input-group-btn">
25 25
 			<button type="submit" class="search-submit btn btn-default"><span class="fa fa-search"></span></button>
26 26
 		</span>
Please login to merge, or discard this patch.