Merge pull request #98 from MachoThemes/master

Bug-fixing round #3

Author: cristianraiber

archive.php

@@ -6,25 +6,19 @@
  *
  * @package Shapely
  */
-
 get_header(); ?>
+<?php $layout_class = ( function_exists( 'shapely_get_layout_class' ) ) ? shapely_get_layout_class() : ''; ?>
+	<div id="primary" class="col-md-9 mb-xs-24 <?php echo esc_attr( $layout_class ); ?>"><?php
+		if ( have_posts() ) :
 
-	<div id="primary" class="content-area col-md-9 mb-xs-24">
-		<main id="main" class="site-main" role="main">
+			if ( is_home() && ! is_front_page() ) : ?>
+				<header>
+					<h1 class="page-title screen-reader-text"><?php single_post_title(); ?></h1>
+				</header>
 
-		<?php
-		if ( have_posts() ) : ?>
-          
-          <?php if( !get_theme_mod('top_callout', true ) ) { ?>
-			<header class="page-header">
 				<?php
-					the_archive_title( '<h1 class="page-title">', '</h1>' );
-					the_archive_description( '<div class="taxonomy-description">', '</div>' );
-				?>
-			</header><!-- .page-header --><?php
-          } ?>
+			endif;
 
-			<?php
 			/* Start the Loop */
 			while ( have_posts() ) : the_post();
 
@@ -37,17 +31,16 @@
 
 			endwhile;
 
-			the_posts_navigation();
+			if ( function_exists( "shapely_pagination" ) ):
+				shapely_pagination();
+			endif;
 
 		else :
 
 			get_template_part( 'template-parts/content', 'none' );
 
 		endif; ?>
-
-		</main><!-- #main -->
 	</div><!-- #primary -->
-
 <?php
 get_sidebar();
 get_footer();

changelog.txt

@@ -1,3 +1,22 @@
+### 1.7.0
+<a href="https://github.com/puikinsh/shapely/issues">Issues</a>
+	#79 - restyled <q> a little bit ( added a bg, set font style to italic )
+	#66 - woo-setup.php was not deleted from the theme files, fixed
+	#63 - escaped echoes
+	#52 - changed esc_html to wp_kses_post to allow some html tags
+	#51 - related to #66, deleted woo-setup.php
+	#47 - added support for Post thumb in page as well
+	#35 - fixed in the first update
+	#46 - reworked script that fixes the navbar top ( listen event, wait for a specific offset, animate it )
+	#48 - added prev / next for content
+	#29 - this does not happen in the current version of the theme
+	#50 - Content is escaped with wp_kses_post where appropriate
+	#49 - seems to be fixed in the current theme version ( also, added a clearfix after the section - just in case )
+	#39 - sticky navigation removed for hamburger menus ( larger menus could not be used, you can't scroll in a fixed element )
+	#30 - archive page did not implement layout styles
+	#45 - added border-bottom checkbox toggle for widget
+	#79 - added epsilon toggles for widgets
+
 ### 1.0.7
 <a href="https://github.com/puikinsh/shapely/issues">Issues</a>
 	#23 - html was missing a closing tag

footer.php

@@ -25,7 +25,7 @@
 
         <div class="row">
           <div class="site-info col-sm-6">
-            <div class="copyright-text"><?php echo esc_html(get_theme_mod( 'shapely_footer_copyright' )); ?></div>
+            <div class="copyright-text"><?php echo wp_kses_post(get_theme_mod( 'shapely_footer_copyright' )); ?></div>
             <div class="footer-credits"><?php shapely_footer_info(); ?></div>
           </div><!-- .site-info -->
           <div class="col-sm-6 text-right">

inc/admin/welcome-screen/img/macho-themes-logo.svg

@@ -133,31 +133,31 @@ function get_shapely_theme_options() {
 		echo '<style type="text/css">';
 
 		if ( get_theme_mod( 'link_color' ) ) {
-			echo 'a {color:' . esc_html( get_theme_mod( 'link_color' ) ) . '}';
+			echo 'a {color:' . esc_attr( get_theme_mod( 'link_color' ) ) . '}';
 		}
 		if ( get_theme_mod( 'link_hover_color' ) ) {
 			echo 'a:hover, a:active, .post-title a:hover,
         .woocommerce nav.woocommerce-pagination ul li a:focus, .woocommerce nav.woocommerce-pagination ul li a:hover,
-        .woocommerce nav.woocommerce-pagination ul li span.current  { color: ' . esc_html( get_theme_mod( 'link_hover_color' ) ) . ';}';
+        .woocommerce nav.woocommerce-pagination ul li span.current  { color: ' . esc_attr( get_theme_mod( 'link_hover_color' ) ) . ';}';
 		}
 
 		if ( get_theme_mod( 'button_color' ) ) {
 			echo '.btn-filled, .btn-filled:visited, .woocommerce #respond input#submit.alt,
           .woocommerce a.button.alt, .woocommerce button.button.alt,
           .woocommerce input.button.alt, .woocommerce #respond input#submit,
           .woocommerce a.button, .woocommerce button.button,
-          .woocommerce input.button { background:' . esc_html( get_theme_mod( 'button_color' ) ) . ' !important; border: 2px solid' . esc_html( get_theme_mod( 'button_color' ) ) . ' !important;}';
+          .woocommerce input.button { background:' . esc_attr( get_theme_mod( 'button_color' ) ) . ' !important; border: 2px solid' . esc_attr( get_theme_mod( 'button_color' ) ) . ' !important;}';
 		}
 		if ( get_theme_mod( 'button_hover_color' ) ) {
 			echo '.btn-filled:hover, .woocommerce #respond input#submit.alt:hover,
           .woocommerce a.button.alt:hover, .woocommerce button.button.alt:hover,
           .woocommerce input.button.alt:hover, .woocommerce #respond input#submit:hover,
           .woocommerce a.button:hover, .woocommerce button.button:hover,
-          .woocommerce input.button:hover  { background: ' . esc_html( get_theme_mod( 'button_hover_color' ) ) . ' !important; border: 2px solid' . esc_html( get_theme_mod( 'button_hover_color' ) ) . ' !important;}';
+          .woocommerce input.button:hover  { background: ' . esc_attr( get_theme_mod( 'button_hover_color' ) ) . ' !important; border: 2px solid' . esc_attr( get_theme_mod( 'button_hover_color' ) ) . ' !important;}';
 		}
 
 		if ( get_theme_mod( 'social_color' ) ) {
-			echo '.social-icons li a {color: ' . esc_html( get_theme_mod( 'social_color' ) ) . ' !important ;}';
+			echo '.social-icons li a {color: ' . esc_attr( get_theme_mod( 'social_color' ) ) . ' !important ;}';
 		}
 
 		echo '</style>';
@@ -481,9 +481,9 @@ function shapely_get_header_logo() {
 
 	<a href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php
 	if ( $logo[0] != '' ) { ?>
-		<img src="<?php echo $logo[0]; ?>" class="logo" alt="<?php echo esc_html( get_bloginfo( 'name' ) ); ?>"><?php
+		<img src="<?php echo esc_url($logo[0]); ?>" class="logo" alt="<?php echo esc_html( get_bloginfo( 'name' ) ); ?>"><?php
 	} else { ?>
-		<h1 class="site-title"><?php echo esc_html( get_bloginfo( 'name' ) ); ?></h1><?php
+		<span class="site-title"><?php echo esc_html( get_bloginfo( 'name' ) ); ?></span><?php
 	} ?>
 	</a><?php
 }
@@ -586,12 +586,12 @@ function shapely_footer_callout() {
 				<div class="col-sm-12 text-center p0">
 					<div class="overflow-hidden">
 						<div class="col-sm-9">
-							<h3 class="cfa-text"><?php echo esc_html( get_theme_mod( 'footer_callout_text' ) ); ?></h3>
+							<h3 class="cfa-text"><?php echo wp_kses_post( get_theme_mod( 'footer_callout_text' ) ); ?></h3>
 						</div>
 						<div class="col-sm-3">
 							<a href='<?php echo esc_url( get_theme_mod( 'footer_callout_link' ) ); ?>'
 							   class="mb0 btn btn-lg btn-filled cfa-button">
-								<?php echo esc_html( get_theme_mod( 'footer_callout_btntext' ) ); ?>
+								<?php echo wp_kses_post( get_theme_mod( 'footer_callout_btntext' ) ); ?>
 							</a>
 						</div>
 					</div>
@@ -612,7 +612,7 @@ function shapely_get_attachment_image() {
 	$src = wp_get_attachment_image_src( $id, 'full', false );
 
 	if ( ! empty( $src[0] ) ) {
-		echo $src[0];
+		echo esc_url($src[0]);
 	}
 
 	die();