Changeset 2123371

genesis-connect-woocommerce/tags/1.1.0

Property svn:ignore

-                      old
+                      new
+.editorconfig
 .git
 .gitignore
 .gitattributes
 .svnignore
+composer.json
+composer.lock
 node_modules
+phpcs.xml.dist
+vendor

genesis-connect-woocommerce/tags/1.1.0/admin/notices.php

-                      r1921233
+                      r2123371
  * Callbacks for `admin_notices` action to load HTML notices.
+ *
  * @package genesis_connect_woocommerce
  * @version 1.0
+ * @package Genesis_Connect_WooCommerce
+ * @since 1.0
  */
-defined( 'ABSPATH' ) || exit;
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
+/**
+ * Display notice message if WooCommerce is not active.
+ *
+ * Callback for WordPress 'admin_notices' action.
+ *
+ * @since 1.0
+ */
 function gencwooc_woocommerce_notice() {
     include GCW_ADMIN_DIR . '/views/html-notice-needs-woocommerce.php';
+}
+/**
+ * Display notice message if Genesis is not active.
+ *
+ * Callback for WordPress 'admin_notices' action.
+ *
+ * @since 1.0
+ */
 function gencwooc_genesis_notice() {
     include GCW_ADMIN_DIR . '/views/html-notice-needs-genesis.php';

genesis-connect-woocommerce/tags/1.1.0/admin/views/html-notice-needs-genesis.php

-                      r1921233
+                      r2123371
 <?php
 /**
+ * Admin View: Notice - needs Genesis.
+ * View for WordPress `admin_notice` if Genesis is not active.
+ *
+ * @package Genesis_Connect_WooCommerce
+ * @since 1.0.0
  */
+defined( 'ABSPATH' ) || exit;
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 ?>
 <div id="message" class="error notice">
+    <p><?php _e( '<i>Genesis Connect for WooCommerce</i> requires a Genesis child theme. <strong>Please activate a Genesis theme or disable Genesis Connect.</strong>', 'gencwooc' ); ?></p>
+    <p>
+        <?php esc_html_e( 'Genesis Connect for WooCommerce requires a Genesis child theme. Please activate a Genesis theme or disable Genesis Connect.', 'gencwooc' ); ?>
+    </p>
 </div>

genesis-connect-woocommerce/tags/1.1.0/admin/views/html-notice-needs-woocommerce.php

-                      r1921233
+                      r2123371
 <?php
 /**
+ * Admin View: Notice - needs WooCommerce.
+ * View for WordPress `admin_notice` if WooCommerce is not active.
+ *
+ * @package Genesis_Connect_WooCommerce
+ * @since 1.0.0
  */
+defined( 'ABSPATH' ) || exit;
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 ?>
 <div id="message" class="error notice">
+    <p><?php _e( '<i>Genesis Connect for WooCommerce</i> requires WooCommerce. <strong>Please activate WooCommerce or disable Genesis Connect.</strong>', 'gencwooc' ); ?></p>
+    <p>
+        <?php esc_html_e( 'Genesis Connect for WooCommerce requires WooCommerce. Please activate WooCommerce or disable Genesis Connect.', 'gencwooc' ); ?>
+    </p>
 </div>

genesis-connect-woocommerce/tags/1.1.0/genesis-connect-woocommerce.php

-                      r1921233
+                      r2123371
 <?php
+/*
+Plugin Name: Genesis Connect for WooCommerce
+Plugin URI: https://wordpress.org/plugins/genesis-connect-woocommerce/
+Version: 1.0
+Author: StudioPress
+Author URI: https://www.studiopress.com/
+Description: Allows you to seamlessly integrate WooCommerce with the Genesis Framework and Genesis child themes.
+WC requires at least: 3.3.0
+WC tested up to: 3.4
+/**
+ * Plugin Name: Genesis Connect for WooCommerce
+ * Plugin URI: https://wordpress.org/plugins/genesis-connect-woocommerce/
+ * Version: 1.1.0
+ * Author: StudioPress
+ * Author URI: https://www.studiopress.com/
+ * Description: Allows you to seamlessly integrate WooCommerce with the Genesis Framework and Genesis child themes.
+ * Text Domain: gencwooc
+ * License: GNU General Public License v2.0 (or later)
+ * License URI: http://www.opensource.org/licenses/gpl-license.php
+ *
+ * WC requires at least: 3.3.0
+ * WC tested up to: 3.6.4
+ *
+ * @package Genesis_Connect_WooCommerce
+ *
+ * Special thanks to Ade Walker (http://www.studiograsshopper.ch/) for his contributions to this plugin.
+ */
+License: GNU General Public License v2.0 (or later)
+License URI: http://www.opensource.org/licenses/gpl-license.php
+Special thanks to Ade Walker (http://www.studiograsshopper.ch/) for his contributions to this plugin.
+*/
+/** Define the Genesis Connect for WooCommerce constants */
+define( 'GCW_DIR', dirname( __FILE__ ) );
 define( 'GCW_TEMPLATE_DIR', dirname( __FILE__ ) . '/templates' );
 define( 'GCW_LIB_DIR', dirname( __FILE__ ) . '/lib');
 define( 'GCW_ADMIN_DIR', dirname( __FILE__ ) . '/admin');
+define( 'GCW_LIB_DIR', dirname( __FILE__ ) . '/lib' );
+define( 'GCW_ADMIN_DIR', dirname( __FILE__ ) . '/admin' );
 define( 'GCW_WIDGETS_DIR', dirname( __FILE__ ) . '/widgets' );
 define( 'GCW_SP_DIR', dirname( __FILE__ ) . '/sp-plugins-integration' );
 …
 add_action( 'after_setup_theme', 'gencwooc_setup' );
 /**
  * Setup GCW
+ * Setup Genesis Connect for WooCommerce.
+ *
  * Checks whether WooCommerce is active, then checks if relevant
  * theme support exists. Once past these checks, loads the necessary
  * files, actions and filters for the plugin to do its thing.
+ * Checks whether WooCommerce is active.
+ * Once past these checks, loads the necessary files, actions and filters for the plugin
+ * to do its thing.
+ *
  * @since 0.9.0
 …
     require_once GCW_ADMIN_DIR . '/notices.php';
     $ready = true;
     if ( ! function_exists( 'is_plugin_active' ) ) {
         require_once( ABSPATH . '/wp-admin/includes/plugin.php' );
+        require_once ABSPATH . '/wp-admin/includes/plugin.php';
+    }
     if ( ! is_plugin_active( 'woocommerce/woocommerce.php' ) ) {
         add_action( 'admin_notices', 'gencwooc_woocommerce_notice' );
         $ready = false;
+    }
 …
     global $woocommerce;
+    /** Load GCW files */
+    require_once( GCW_LIB_DIR . '/template-loader.php' );
+    require_once GCW_LIB_DIR . '/template-loader.php';
+    require_once GCW_LIB_DIR . '/posts-per-page.php';
+    require_once GCW_LIB_DIR . '/widgets.php';
+    // Load posts per page option
+    require_once( GCW_LIB_DIR . '/posts-per-page.php' );
+    if ( ! current_theme_supports( 'gencwooc-woo-breadcrumbs' ) ) {
+        require_once GCW_LIB_DIR . '/breadcrumb.php';
+    }
-    /** Load modified Genesis breadcrumb filters and callbacks */
-    if ( ! current_theme_supports( 'gencwooc-woo-breadcrumbs') )
-        require_once( GCW_LIB_DIR . '/breadcrumb.php' );
-    /** Ensure WooCommerce 2.0+ compatibility */
     add_theme_support( 'woocommerce' );
-    /** Add Genesis Layout, Genesis Scripts and SEO options to Product edit screen */
     add_post_type_support( 'product', array( 'genesis-layouts', 'genesis-scripts', 'genesis-seo' ) );
-    /** Add Studiopress plugins support */
     add_post_type_support( 'product', array( 'genesis-simple-sidebars', 'genesis-simple-menus' ) );
-    /** Add Widgets */
     if ( current_theme_supports( 'gencwooc-featured-products-widget' ) ) {
         require_once( GCW_WIDGETS_DIR . '/woocommerce-featured-widgets.php' );
+        require_once GCW_WIDGETS_DIR . '/class-gencwooc-featured-products.php';
+    }
-    /** Take control of shop template loading */
     remove_filter( 'template_include', array( &$woocommerce, 'template_loader' ) );
     add_filter( 'template_include', 'gencwooc_template_loader', 20 );
-    /** Integration - Genesis Simple Sidebars */
     if ( is_plugin_active( 'genesis-simple-sidebars/plugin.php' ) ) {
         require_once( GCW_SP_DIR . '/genesis-simple-sidebars.php' );
+        require_once GCW_SP_DIR . '/genesis-simple-sidebars.php';
+    }
-    /** Integration - Genesis Simple Menus */
     if ( is_plugin_active( 'genesis-simple-menus/simple-menu.php' ) ) {
         require_once( GCW_SP_DIR . '/genesis-simple-menus.php' );
+        require_once GCW_SP_DIR . '/genesis-simple-menus.php';
+    }
+}
+add_action( 'plugins_loaded', 'gencwooc_load_plugin_textdomain' );
+/**
+ * Load plugin translated strings.
+ *
+ * Callback for WordPress 'plugins_loaded' action.
+ *
+ * @uses load_plugin_textdomain()
+ * @link https://codex.wordpress.org/Function_Reference/load_plugin_textdomain
+ *
+ * @since 1.1.0
+ */
+function gencwooc_load_plugin_textdomain() {
+    load_plugin_textdomain( 'gencwooc', false, GCW_DIR . '/languages' );
+}

genesis-connect-woocommerce/tags/1.1.0/lib/breadcrumb.php

-                      r1812865
+                      r2123371
 <?php
 /**
+ * This file contains functions related modifying Genesis Breadcrumb output
+ *
+ * @package genesis_connect_woocommerce
+ * @version 0.9.8
+ *
+ * @since 0.9.0
+ *
+ *
+ * By default, the Genesis Breadcrumb class does not handle Shop pages and taxonomy
+ * archives in the same way as WooC's breadcrumbs. These filters and callback
+ * functions modify the default Genesis breadcrumb output so that the breadcrumb
+ * trail mimics that of WooC's breadcrumbs, for:
+ * This file contains functions related modifying Genesis Breadcrumb output.
+ *
+ * @package Genesis_Connect_WooCommerce
+ * @since 0.9.0
+ *
+ *
+ * By default, the Genesis Breadcrumb class does not handle Shop pages and taxonomy archives in the
+ * same way as WooCommerce breadcrumbs. These filters and callback functions modify the default Genesis
+ * breadcrumb output so that the breadcrumb trail mimics that of WooCommerce breadcrumbs for:
  * - Shop page (archive page)
  * - Single product
  * - Taxonomy archive
+ *
  * Users who prefer to use WooC's breadcrumbs can do so by adding this to their child
+ * Users who prefer to use WooCommerce breadcrumbs can do so by adding this to their child
  * theme's functions.php:
  * - add_theme_support( 'gencwooc-woo-breadcrumbs' );
 …
  * - remove_action( 'genesis_before_loop', 'genesis_do_breadcrumbs' );
+ *
  * @see readme.txt for more details
+ * @see readme.txt For more details.
+ *
  * As this modification code uses existing Genesis Breadcrumb filters there is a risk that
 …
  * @see genesis/lib/classes/breadcrumb.php v1.8
  * @see woocommerce/templates/shop/breadcrumb.php v1.4.4
+ *
+ * @TODO Replace with subclass of Genesis_Breadcrumb?
+ */
+/**
+ * Prevent direct access to this file
+ */
+if ( ! defined( 'ABSPATH' ) )
+    exit( __( 'Sorry, you are not allowed to access this file directly.' ) );
+ */
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 add_filter( 'genesis_archive_crumb', 'gencwooc_get_archive_crumb_filter', 10, 2 );
 /**
  * Filter the Genesis Breadcrumbs archive crumb
+ *
  * Needed for Product Archive (Shop page) and Taxonomy archives
+ * Filter the Genesis Breadcrumbs archive crumb.
+ *
+ * Needed for Product Archive (Shop page) and Taxonomy archives.
+ *
  * Note: relevant WooCommerce settings (WooCommerce > Settings > Pages tab):
 …
+ *
  * @since 0.9.0
  * @updated 0.9.7
+ *
  * @param str $crumb Breadcrumb 'crumb' for archives
  * @param array $args Genesis Breadcrumb args
  * @return str $crumb, either modified $crumb, or original $crumb
+ *
+ * @param string $crumb Breadcrumb 'crumb' for archives.
+ * @param array  $args Genesis Breadcrumb args.
+ *
+ * @return string $crumb Breadcrumb 'crumb' for archives.
  */
 function gencwooc_get_archive_crumb_filter( $crumb, $args ) {
+    /** Are we on the product archive page? */
+    if ( is_post_type_archive( 'product') && get_option( 'page_on_front' ) !== wc_get_page_id( 'shop' ) ) {
+        $shop_id = wc_get_page_id( 'shop' );
+        $shop_name = $shop_id ? get_the_title( $shop_id ) : ucwords( get_option('woocommerce_shop_slug') );
+        if ( is_search() ) :
+            $crumb = gencwooc_get_crumb_link( get_post_type_archive_link( 'product' ), $shop_name, $shop_name, $args['sep'] . __( 'Search results for &ldquo;', 'woocommerce' ) . get_search_query() . '&rdquo;' );
+        else :
+            $crumb = $shop_name;
+        endif;
+    if ( is_post_type_archive( 'product' ) && get_option( 'page_on_front' ) !== wc_get_page_id( 'shop' ) ) {
+        $shop_id   = wc_get_page_id( 'shop' );
+        $shop_name = $shop_id ? get_the_title( $shop_id ) : ucwords( get_option( 'woocommerce_shop_slug' ) );
+        $crumb     = $shop_name;
+        if ( is_search() ) {
+            $crumb = gencwooc_get_crumb_link(
+                get_post_type_archive_link( 'product' ),
+                $shop_name,
+                $shop_name,
+                $args['sep'] . __( 'Search results for &ldquo;', 'gencwooc' ) . get_search_query() . '&rdquo;'
+            );
+        }
         return apply_filters( 'gencwooc_product_archive_crumb', $crumb, $args );
+    }
-    /** Are we on a shop taxonomy archive page? */
     if ( is_tax( 'product_cat' ) || is_tax( 'product_tag' ) ) {
+        $crumb = '';
+        $prepend = '';
+        /** Should we prepend crumb with 'shop' page link? */
+        /** See Dashboard > WooC Settings > Pages tab */
+        $shop_url = get_option( 'woocommerce_prepend_shop_page_to_urls' );
+        $shop_id = wc_get_page_id( 'shop' );
+        $crumb      = '';
+        $prepend    = '';
+        $shop_url   = get_option( 'woocommerce_prepend_shop_page_to_urls' );
+        $shop_id    = wc_get_page_id( 'shop' );
         $shop_title = get_the_title( $shop_id );
         if ( 'yes' == $shop_url && $shop_id && get_option( 'page_on_front' ) !== $shop_id )
+        if ( 'yes' === $shop_url && $shop_id && get_option( 'page_on_front' ) !== $shop_id ) {
             $prepend = gencwooc_get_crumb_link( get_permalink( $shop_id ), $shop_title, $shop_title, $args['sep'] );
+        }
+    }
     if ( is_tax( 'product_cat' ) ) {
+        $term = get_term_by( 'slug', get_query_var( 'term' ), get_query_var( 'taxonomy' ) );
+        $term    = get_term_by( 'slug', get_query_var( 'term' ), get_query_var( 'taxonomy' ) );
         $parents = array();
+        $parent = $term->parent;
+        while ( $parent ):
+            $parents[] = $parent;
+        $parent  = $term->parent;
+        while ( $parent ) {
+            $parents[]  = $parent;
             $new_parent = get_term_by( 'id', $parent, get_query_var( 'taxonomy' ) );
             $parent = $new_parent->parent;
         endwhile;
+            $parent     = $new_parent->parent;
+        }
         $crumb .= $prepend;
         if ( ! empty( $parents ) ) :
+        if ( ! empty( $parents ) ) {
             $parents = array_reverse( $parents );
+            foreach ( $parents as $parent ) :
+                $item = get_term_by( 'id', $parent, get_query_var( 'taxonomy' ) );
+            foreach ( $parents as $parent ) {
+                $item   = get_term_by( 'id', $parent, get_query_var( 'taxonomy' ) );
                 $crumb .= gencwooc_get_crumb_link( get_term_link( $item->slug, 'product_cat' ), $item->name, $item->name, $args['sep'] );
             endforeach;
         endif;
+            }
+        }
         $crumb .= single_term_title( '', false );
 …
     if ( is_tax( 'product_tag' ) ) {
         $crumb .= $prepend . __( 'Products tagged &ldquo;', 'gencwooc' ) . single_term_title( '', false ) . _x( '&rdquo;', 'endquote', 'gencwooc' );
 …
+    }
-    /** Original unmodified */
     return $crumb;
+}
+}
 add_filter( 'genesis_single_crumb', 'gencwooc_get_single_crumb', 10, 2 );
 /**
+ * Filter the Genesis Breadcrumbs singular crumb
+ *
+ * Needed for single Product pages
+ *
+ * @since 0.9.0
+ *
+ * @param str $crumb Breadcrumb 'crumb' for single posts
+ * @param array $args Genesis Breadcrumb args
+ * @return str $crumb, either modified $crumb, or original $crumb
+ * Filter the Genesis Breadcrumbs singular crumb.
+ *
+ * Needed for single Product pages.
+ *
+ * @since 0.9.0
+ *
+ * @global WP_Post $post The current WP_Post.
+ *
+ * @param string $crumb Breadcrumb 'crumb' for single posts.
+ * @param array  $args  Genesis Breadcrumb args.
+ *
+ * @return string $crumb Breadcrumb 'crumb' for single posts.
  */
 function gencwooc_get_single_crumb( $crumb, $args ) {
-    /** Are we on a single product page? */
     if ( is_singular( 'product' ) ) {
         global $post;
+        $crumb = '';
+        $prepend = '';
+        /** Should we prepend crumb with 'shop' page link? */
+        /** See Dashboard > WooC Settings > Pages tab */
+        $shop_url = get_option( 'woocommerce_prepend_shop_page_to_urls' );
+        $shop_id = wc_get_page_id( 'shop' );
+        $crumb      = '';
+        $prepend    = '';
+        $shop_url   = get_option( 'woocommerce_prepend_shop_page_to_urls' );
+        $shop_id    = wc_get_page_id( 'shop' );
         $shop_title = get_the_title( $shop_id );
         if ( 'yes' == $shop_url && $shop_id && get_option( 'page_on_front' ) !== $shop_id )
+        if ( 'yes' === $shop_url && $shop_id && get_option( 'page_on_front' ) !== $shop_id ) {
             $prepend = gencwooc_get_crumb_link( get_permalink( $shop_id ), $shop_title, $shop_title, $args['sep'] );
+        }
         $crumb .= $prepend;
+        if ( $terms = wp_get_object_terms( $post->ID, 'product_cat' ) ) :
+            $term = current( $terms );
+        $terms  = wp_get_object_terms( $post->ID, 'product_cat' );
+        if ( $terms ) {
+            $term    = current( $terms );
             $parents = array();
+            $parent = $term->parent;
+            while ( $parent ):
+                $parents[] = $parent;
+            $parent  = $term->parent;
+            while ( $parent ) {
+                $parents[]  = $parent;
                 $new_parent = get_term_by( 'id', $parent, 'product_cat' );
                 $parent = $new_parent->parent;
             endwhile;
             if( ! empty( $parents ) ):
+                $parent     = $new_parent->parent;
+            }
+            if ( ! empty( $parents ) ) {
                 $parents = array_reverse( $parents );
+                foreach ( $parents as $parent ) :
+                    $item = get_term_by( 'id', $parent, 'product_cat' );
+                foreach ( $parents as $parent ) {
+                    $item   = get_term_by( 'id', $parent, 'product_cat' );
                     $crumb .= gencwooc_get_crumb_link( get_term_link( $item->slug, 'product_cat' ), $item->name, $item->name, $args['sep'] );
+                endforeach;
+            endif;
+                }
+            }
             $crumb .= gencwooc_get_crumb_link( get_term_link( $term->slug, 'product_cat' ), $term->name, $term->name, $args['sep'] );
         endif;
+        }
         $crumb .= get_the_title();
 …
+    }
-    /** Fallback - original unmodified */
     return $crumb;
+}
+}
 /**
  * Helper function to create anchor link for a single crumb.
+ *
+ * This is a copy of Genesis_Breadcrumb::get_breadcrumb_link() (G1.8)
+ *
+ * @since 0.9.0
+ *
+ * @param string $url URL for href attribute
+ * @param string $title title attribute
+ * @param string $content linked content
+ * @param string $sep Separator
+ * This is a copy of Genesis_Breadcrumb::get_breadcrumb_link() (G1.8).
+ *
+ * @since 0.9.0
+ *
+ * @param string $url     URL for href attribute.
+ * @param string $title   The title attribute.
+ * @param string $content The link content.
+ * @param string $sep     Separator. Default false.
+ *
  * @return string HTML markup for anchor link and optional separator.
  */
 function gencwooc_get_crumb_link( $url, $title, $content, $sep = false ) {
+    $link = sprintf( '<a href="%s" title="%s">%s</a>', esc_attr( $url ), esc_attr( $title ), esc_html( $content ) );
+    if ( $sep )
+    $link = sprintf(
+        '<a href="%s" title="%s">%s</a>',
+        esc_attr( $url ),
+        esc_attr( $title ),
+        esc_html( $content )
+    );
+    if ( $sep ) {
         $link .= $sep;
+    }
     return $link;

genesis-connect-woocommerce/tags/1.1.0/lib/posts-per-page.php

-                      r1575771
+                      r2123371
 <?php
 /**
+ * These functions manage loading of plugin-specific addons to the WooCommerce
+ * settings page.
+ * These functions manage loading of plugin-specific addons to the WooCommerce settings page.
+ *
+ * @package genesis_connect_woocommerce
+ * @version 0.9.8
+ *
+ * @package Genesis_Connect_WooCommerce
  * @since 0.9.0
  */
+/**
+ * Prevent direct access to this file
+ */
+if ( ! defined( 'ABSPATH' ) )
+    exit( _( 'Sorry, you are not allowed to access this file directly.' ) );
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 add_filter( 'woocommerce_settings_tabs_array', 'genesis_connect_addon_tab', 50 );
 /*
+/**
  * Add a custom tab in the WooCommerce settings for Genesis Connect.
+ *
  * @since 1.0.0
+ *
+ * @param array $tabs Used to add a tab to the WooCommerce settings page.
+ *
  * @return array $tabs Used to add a tab to the WooCommerce settings page.
  */
 function genesis_connect_addon_tab( $tabs ) {
-    // Add our own section.
     $tabs['gencwooc'] = __( 'Genesis Connect Addons', 'gencwooc' );
     return $tabs;
 …
+ *
  * @since 1.0.0
- * @return array Multiple arrays holding our section information
  */
 function genesis_connect_settings_tab() {
     woocommerce_admin_fields( genesis_connect_get_settings() );
+    woocommerce_admin_fields( genesis_connect_get_settings() );
+}
 …
+ *
  * @since 1.0.0
- * @return array Settings to update.
  */
 function genesis_connect_update_settings() {
     woocommerce_update_options( genesis_connect_get_settings() );
+    woocommerce_update_options( genesis_connect_get_settings() );
+}
 …
+ *
  * @since 1.0.0
+ *
  * @return array $settings Array of our settings.
  */
 function genesis_connect_get_settings() {
+    $settings = array(
+    $settings = array(
         'gencwooc_section_title' => array(
             'name' => __( 'Genesis Connect Addons', 'gencwooc' ),
             'type' => 'title',
             'desc' => 'Set and save additional WooCommerce settings here.',
             'id'   => 'gencwooc_section_title'
+            'id'   => 'gencwooc_section_title',
         ),
         'products_per_page' => array(
+        'products_per_page'      => array(
             'name'    => __( 'Products Per Page', 'gencwooc' ),
             'type'    => 'number',
 …
             'id'      => 'gencwooc_products_per_page',
             'default' => apply_filters( 'genesiswooc_default_products_per_page', get_option( 'posts_per_page' ) ),
+        ),
+        'section_end' => array(
+             'type' => 'sectionend',
+             'id' => 'gencwooc_section_end'
+        )
+    );
+    return $settings;
+        ),
+        'section_end'            => array(
+            'type' => 'sectionend',
+            'id'   => 'gencwooc_section_end',
+        ),
+    );
+    return $settings;
+}
+add_filter( 'loop_shop_per_page', 'genesiswooc_products_per_page' );
 /**
+ * Execute settings on the frontend (this should probably
+ * go somewhere else other than this file).
+ * Execute settings on the frontend (this should probably go somewhere else other than this file).
+ *
  * @since 1.0.0
+ * @return array $q New query for the product page.
+ *
+ * @param integer $count Products per page to display.
+ *
+ * @return integer $count Products per page to display.
  */
-add_filter( 'loop_shop_per_page', 'genesiswooc_products_per_page' );
 function genesiswooc_products_per_page( $count ) {
+    $count = get_option( 'gencwooc_products_per_page' ) ? get_option( 'gencwooc_products_per_page' ) : apply_filters( 'genesiswooc_default_products_per_page', get_option( 'posts_per_page' ) );
+    $count = get_option( 'gencwooc_products_per_page' );
+    if ( ! $count ) {
+        $count = apply_filters( 'genesiswooc_default_products_per_page', get_option( 'posts_per_page' ) );
+    }
     return $count;

genesis-connect-woocommerce/tags/1.1.0/lib/template-loader.php

-                      r1921233
+                      r2123371
 <?php
 /**
+ * These functions manage loading of templates for WooCommerce
+ *
+ * @package genesis_connect_woocommerce
+ * @version 0.9.8
+ *
+ * These functions manage loading of templates for WooCommerce.
+ *
+ * @package Genesis_Connect_WooCommerce
  * @since 0.9.0
  */
+/**
+ * Prevent direct access to this file
+ */
+if ( ! defined( 'ABSPATH' ) )
+    exit( _( 'Sorry, you are not allowed to access this file directly.' ) );
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 /**
  * Load the Genesis-fied templates, instead of the WooCommerce defaults.
+ *
  * Hooked to 'template_include' filter
+ *
  * This template loader determines which template file will be used for the requested page, and uses the
  * following hierarchy to find the template:
+ * Hooked to 'template_include' filter.
+ *
+ * This template loader determines which template file will be used for the requested page,
+ * and uses the following hierarchy to find the template:
  * 1. First looks in the child theme's 'woocommerce' folder.
  * 2. If no template found, falls back to GCW's templates.
+ *
+ * For taxonomy templates, first looks in child theme's 'woocommerce' folder and searches for term specific template,
+ * then taxonomy specific template, then taxonomy.php. If no template found, falls back to GCW's taxonomy.php.
+ * For taxonomy templates, first looks in child theme's 'woocommerce' folder and searches for term
+ * specific template, then taxonomy specific template, then taxonomy.php. If no template found,
+ * falls back to GCW's taxonomy.php.
+ *
  * GCW provides three templates in the plugin's 'templates' directory:
 …
  * - taxonomy.php
+ *
+ * Users can override GCW templates by placing their own templates in their child theme's 'woocommerce' folder.
+ * The 'woocommerce' folder must be a folder in the child theme's root directory, eg themes/my-child-theme/woocommerce
+ * Users can override GCW templates by placing their own templates in their child theme's
+ * 'woocommerce' folder. The 'woocommerce' folder must be a folder in the child theme's root
+ * directory, eg themes/my-child-theme/woocommerce.
+ *
  * Permitted user templates (as per WP Template Hierarchy) are:
  * - single-product.php
 …
  * - taxonomy.php
+ *
+ * Note that in the case of taxonomy templates, this function accommodates ALL taxonomies registered to the
+ * 'product' custom post type. This means that it will cater for users' own custom taxonomies as well as WooC's.
+ * Note that in the case of taxonomy templates, this function accommodates ALL taxonomies
+ * registered to the 'product' custom post type. This means that it will cater for users' own
+ * custom taxonomies as well as WooCommerce taxonomies.
+ *
  * @since 0.9.0
+ *
  * @param string $template Template file as per template hierarchy
  * @return string $template Specific GCW template if a product page (single or archive)
  * or a product taxonomy term, or returns original template
+ * @param string $template Template file as per template hierarchy.
+ *
+ * @return string $template Template file as per template hierarchy.
  */
 function gencwooc_template_loader( $template ) {
 …
+    }
+    if ( is_single() && 'product' == get_post_type() ) {
+    if ( is_single() && 'product' === get_post_type() ) {
         $template = locate_template( array( 'woocommerce/single-product.php' ) );
         if ( ! $template )
+        if ( ! $template ) {
             $template = GCW_TEMPLATE_DIR . '/single-product.php';
+    }
+    elseif ( is_post_type_archive( 'product' ) ||  is_page( wc_get_page_id( 'shop' ) ) ) {
+        }
+    } elseif ( is_post_type_archive( 'product' ) || is_page( wc_get_page_id( 'shop' ) ) ) {
         $template = locate_template( array( 'woocommerce/archive-product.php' ) );
         if ( ! $template )
+        if ( ! $template ) {
             $template = GCW_TEMPLATE_DIR . '/archive-product.php';
+    }
+    elseif ( is_tax() ) {
+        $term = get_query_var( 'term' );
+        $tax = get_query_var( 'taxonomy' );
+        /** Get an array of all relevant taxonomies */
+        }
+    } elseif ( is_tax() ) {
+        $term       = get_query_var( 'term' );
+        $tax        = get_query_var( 'taxonomy' );
         $taxonomies = get_object_taxonomies( 'product', 'names' );
+        if ( in_array( $tax, $taxonomies ) ) {
+            $tax = sanitize_title( $tax );
+        if ( in_array( $tax, $taxonomies, true ) ) {
+            $tax  = sanitize_title( $tax );
             $term = sanitize_title( $term );
             $templates = array(
                 'woocommerce/taxonomy-'.$tax.'-'.$term.'.php',
                 'woocommerce/taxonomy-'.$tax.'.php',
+                "woocommerce/taxonomy-{$tax}-{$term}.php",
+                "woocommerce/taxonomy-{$tax}.php",
                 'woocommerce/taxonomy.php',
             );
 …
             $template = locate_template( $templates );
+            /** Fallback to GCW template */
+            if ( ! $template )
+            if ( ! $template ) {
                 $template = GCW_TEMPLATE_DIR . '/taxonomy.php';
+            }
+        }
+    }
 …
+}
+/**
+ * Shop Loop 'template part' loader
+/**
+ * Shop Loop 'template part' loader.
+ *
  * ONLY RETAINED FOR BACKWARDS COMPATIBILITY for GCW pre-0.9.2 custom templates which
 …
  * loads the default WooCommerce loop-shop.php file.
+ *
+ * Note: loop-shop.php is used to display products on the archive and taxonomy pages
+ *
+ * Users can override the default WooCommerce loop-shop.php by placing their own template (named loop-shop.php) in
+ * their child theme's 'woocommerce' folder. The'woocommerce' folder must be a folder in the
+ * child theme's root directory, eg themes/my-child-theme/woocommerce.
+ * Note: loop-shop.php is used to display products on the archive and taxonomy pages.
+ *
+ * Users can override the default WooCommerce loop-shop.php by placing their own template
+ * (named loop-shop.php) in their child theme's 'woocommerce' folder. The'woocommerce' folder
+ * must be a folder in the child theme root directory, eg themes/my-child-theme/woocommerce.
+ *
  * It is recommended to use woocommerce/templates/loop-shop.php as the starting point of
  * any custom loop template.
 …
+ *
  * Note: updated v0.9.3 to reflect changes to woocommerce_get_template_part() introduced in
+ * WooC v1.4+ and, effectively, this function is a clone of woocommerce_get_template_part()
+ * WooCommerce v1.4+ and, effectively, this function is a clone of woocommerce_get_template_part()
+ *
+ * @global object $woocommerce WooCommerce instance
+ *
  * @since 0.9.0
+ * @updated 0.9.8
+ * @global object $woocommerce WooCommerce instance
+ */
+ function gencwooc_get_template_part( $slug, $name = '' ) {
+ *
+ * @param string $slug The template slug.
+ * @param string $name The template name.
+ */
+function gencwooc_get_template_part( $slug, $name = '' ) {
     global $woocommerce;
     $template = '';
+    // Look in yourtheme/slug-name.php and yourtheme/woocommerce/slug-name.php
+    if ( $name )
+        $template = locate_template( array ( "{$slug}-{$name}.php", "{$woocommerce->template_url}{$slug}-{$name}.php" ) );
+    // Get default slug-name.php
+    if ( !$template && $name && file_exists( $woocommerce->plugin_path() . "/templates/{$slug}-{$name}.php" ) )
+    if ( $name ) {
+        $template = locate_template( array( "{$slug}-{$name}.php", "{$woocommerce->template_url}{$slug}-{$name}.php" ) );
+    }
+    if ( ! $template && $name && file_exists( $woocommerce->plugin_path() . "/templates/{$slug}-{$name}.php" ) ) {
         $template = $woocommerce->plugin_path() . "/templates/{$slug}-{$name}.php";
+    // If template file doesn't exist, look in yourtheme/slug.php and yourtheme/woocommerce/slug.php
+    if ( !$template )
+        $template = locate_template( array ( "{$slug}.php", "{$woocommerce->template_url}{$slug}.php" ) );
+    if ( $template )
+    }
+    if ( ! $template ) {
+        $template = locate_template( array( "{$slug}.php", "{$woocommerce->template_url}{$slug}.php" ) );
+    }
+    if ( $template ) {
         load_template( $template, false );
+}
+/**
+ * Display shop items
+ *
+ * FOR BACKWARDS COMPATIBILITY with WooCommerce versions pre-1.6.0
+ *
+ * Uses WooCommerce structure and contains all existing WooCommerce hooks
+ * Note that this will also display any content created in the Shop Page itself
+ *
+ * Code based on WooCommerce 1.5.5 woocommerce_archive_product_content()
+    }
+}
+/**
+ * Display shop items.
+ *
+ * For backwards compatibility with WooCommerce versions pre-1.6.0.
+ *
+ * Uses WooCommerce structure and contains all existing WooCommerce hooks.
+ *
+ * Note that this will also display any content created in the Shop Page itself.
+ *
+ * Code based on WooCommerce 1.5.5 woocommerce_archive_product_content().
+ *
  * @see woocommerce/woocommerce-template.php
+ *
+ *
  * @since 0.9.4
  * @updated 0.9.6
  * @global string|int $shop_page_id The ID of the Shop WP Page
+ *
+ * @global string|int $shop_page_id The ID of the Shop WP Page.
  */
 function genesiswooc_product_archive() {
 …
     global $shop_page_id;
+    if ( !is_search() ) :
+            $shop_page = get_post( $shop_page_id );
+            $shop_page_title = apply_filters( 'the_title', ( get_option( 'woocommerce_shop_page_title' ) ) ? get_option( 'woocommerce_shop_page_title' ) : $shop_page->post_title, $shop_page->ID );
+            $shop_page_content = $shop_page->post_content;
+        else :
+            $shop_page_title = __( 'Search Results:', 'woocommerce' ) . ' &ldquo;' . get_search_query() . '&rdquo;';
+            if ( get_query_var( 'paged' ) ) $shop_page_title .= ' &mdash; ' . __( 'Page', 'woocommerce' ) . ' ' . get_query_var( 'paged' );
+            $shop_page_content = '';
+        endif;
+    if ( ! is_search() ) {
+        $shop_page         = get_post( $shop_page_id );
+        $shop_page_title   = apply_filters( 'the_title', ( get_option( 'woocommerce_shop_page_title' ) ) ? get_option( 'woocommerce_shop_page_title' ) : $shop_page->post_title, $shop_page->ID );
+        $shop_page_content = $shop_page->post_content;
+    } else {
+        $shop_page_title = __( 'Search Results:', 'gencwooc' ) . ' &ldquo;' . get_search_query() . '&rdquo;';
+        if ( get_query_var( 'paged' ) ) {
+            $shop_page_title .= ' &mdash; ' . __( 'Page', 'gencwooc' ) . ' ' . get_query_var( 'paged' );
+        }
+        $shop_page_content = '';
+    }
     do_action( 'woocommerce_before_main_content' );
+?>
+    <h1 class="page-title"><?php echo $shop_page_title ?></h1>
+    <?php echo apply_filters( 'the_content', $shop_page_content );
+    ?>
+    <h1 class="page-title"><?php echo $shop_page_title; // phpcs:ignore WordPress.Security.EscapeOutput ?></h1>
+    <?php
+    echo apply_filters( 'the_content', $shop_page_content ); // phpcs:ignore WordPress.Security.EscapeOutput
     woocommerce_get_template_part( 'loop', 'shop' );
 …
     do_action( 'woocommerce_after_main_content' );
+}
+/**
+ * Displays shop items for the queried taxonomy term
+ *
+ * FOR BACKWARDS COMPATIBILITY with WooCommerce versions pre-1.6.0
+ *
+ * Uses WooCommerce structure and contains all existing WooCommerce hooks
+ *
+ * Code based on WooCommerce 1.5.5 woocommerce_product_taxonomy_content()
+}
+/**
+ * Displays shop items for the queried taxonomy term.
+ *
+ * For backwards compatibility with WooCommerce versions pre-1.6.0.
+ *
+ * Uses WooCommerce structure and contains all existing WooCommerce hooks.
+ *
+ * Code based on WooCommerce 1.5.5 woocommerce_product_taxonomy_content().
+ *
  * @see woocommerce/woocommerce-template.php
+ *
+ *
  * @since 0.9.4
  */
 …
+}
+/**
+ * Displays shop items for archives (taxonomy and main shop page)
+ *
+ * Only loaded if WooC 1.6.0+ is in use.
+ *
+ * Uses WooCommerce structure and contains all existing WooCommerce hooks
+ *
+ * Code based on WooCommerce 2.1.12 templates/archive-product.php
+ *
+/**
+ * Displays shop items for archives (taxonomy and main shop page).
+ *
+ * Only loaded if WooCommerce 1.6.0+ is in use.
+ *
+ * Uses WooCommerce structure and contains all existing WooCommerce hooks.
+ *
+ * Code based on WooCommerce 2.1.12 templates/archive-product.php.
+ *
  * @since 0.9.4
- * @updated 0.9.8
  */
 function genesiswooc_content_product() {
     /**
      * woocommerce_before_main_content hook
+     * For woocommerce_before_main_content hook.
+     *
      * @hooked woocommerce_output_content_wrapper - 10 (outputs opening divs for the content)
 …
     if ( apply_filters( 'woocommerce_show_page_title', true ) ) {
         echo '<h1 class="woocommerce-products-header__title page-title">';
         woocommerce_page_title();
         echo '</h1>';
+    }
 …
          */
         do_action( 'woocommerce_before_shop_loop' );
         woocommerce_product_loop_start();
         if ( wc_get_loop_prop( 'total' ) ) {
             while ( have_posts() ) {
                 the_post();
                 /**
                  * Hook: woocommerce_shop_loop.
 …
                  */
                 do_action( 'woocommerce_shop_loop' );
                 wc_get_template_part( 'content', 'product' );
+            }
+        }
         woocommerce_product_loop_end();
         /**
          * Hook: woocommerce_after_shop_loop.
 …
         do_action( 'woocommerce_no_products_found' );
+    }
     /**
      * Hook: woocommerce_after_main_content.

genesis-connect-woocommerce/tags/1.1.0/readme.txt

-                      r1921233
+                      r2123371
 Tags: genesis, genesiswp, studiopress, woocommerce
 Requires at least: 3.3
 Tested up to: 4.9
 Stable tag: 1.0
+Tested up to: 5.2.2
+Stable tag: 1.1.0
 This plugin allows you to seamlessly integrate WooCommerce with the Genesis Framework and Genesis child themes.
 …
 == Changelog ==
+= 1.1.0 =
+* Added php codesniffer via composer package for WordPress code standards.
+* Fixed spacing and syntax issues for WordPress code standards.
+* Renamed Gencwooc_Featured_Products file to adhere to WordPress code standards.
 = 1.0 =
 …
 = 0.9.8 =
 * Released 9 July 2014
 * Updates genesiswooc_content_product() to reflect WooC 2.1+ templates and correct handling of WooC's page title filter function
+* Updates genesiswooc_content_product() to reflect WooCommerce 2.1+ templates and correct handling of WooCommerce page title filter function
 = 0.9.7 =
 …
 = 0.9.2 =
 * Released 15 March 2012
 * single-product.php - Single product title template file now hooked in as per WooC 1.5.2
+* single-product.php - Single product title template file now hooked in as per WooCommerce 1.5.2
 = 0.9.1 =

genesis-connect-woocommerce/tags/1.1.0/sp-plugins-integration/genesis-simple-menus.php

-                      r1812865
+                      r2123371
 <?php
 /**
  * Integration - Genesis Simple Menus
+ * Genesis Simple Menus integration.
+ *
+ * @package genesis_connect_woocommerce
+ * @version 0.9.8
+ *
+ * @package Genesis_Connect_WooCommerce
  * @since 0.9.0
+ *
 …
+ *
  * What GCW integration needs to do:
  *  1. add_post_type_support for 'genesis-simple-menus'
  *  2. deal with serving correct GSM menu for Shop page (product archive)
+ *  1. add_post_type_support for 'genesis-simple-menus'
+ *  2. deal with serving correct GSM menu for Shop page (product archive)
+ *
  * What GCW does:
  *  1. GCW adds post_type_support for GSM - see gencwooc_setup()
  *  2. uses Genesis filters to intercept request and serve correct GSM menu on Shop Page
+ *  1. GCW adds post_type_support for GSM - see gencwooc_setup()
+ *  2. uses Genesis filters to intercept request and serve correct GSM menu on Shop Page
+ *
  * Note: this file is loaded on the 'after_theme_setup' hook only if GSM
  * is activated.
  * @see gencwooc_setup() in genesis-connect-woocommerce.php
+ *
  */
+/**
+ * Prevent direct access to this file
+ */
+if ( ! defined( 'ABSPATH' ) )
+    exit( __( 'Sorry, you are not allowed to access this file directly.', 'genwooc' ) );
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 add_filter( 'genesis_pre_get_option_subnav_type', 'gencwooc_gsm_subnav_type', 9 );
 /**
  * Tells Genesis to load a custom menu
+ * Tells Genesis to load a custom menu.
+ *
  * @since 0.9.0
+ *
  * @see Genesis_Simple_Menus::wp_head()
+ * @param str $nav
+ * @return str 'nav-menu' which tells Genesis to get a custom menu
+ *
+ * @param string $nav The sub nav type.
+ *
+ * @return string The sub nav type.
  */
 function gencwooc_gsm_subnav_type( $nav ) {
 …
 add_filter( 'theme_mod_nav_menu_locations', 'gencwooc_gsm_theme_mod' );
 /**
  * Replace the menu selected in the WordPress Menu settings with the custom one for this request
+ * Replace the menu selected in the WordPress Menu settings with the custom one for this request.
+ *
  * @since 0.9.0
+ *
  * @see Genesis_Simple_Menus::wp_head()
+ * @param array $mods Array of theme mods
+ * @return array $mods Modified array of theme mods
+ *
+ * @param array $mods Array of theme mods.
+ *
+ * @return array $mods Array of theme mods.
  */
 function gencwooc_gsm_theme_mod( $mods ) {
     /** Post meta key as per GSM 0.1.4 */
     $field_name = '_gsm_menu';
+    $shop_id = function_exists( 'wc_get_page_id' ) ? wc_get_page_id( 'shop' ) : woocommerce_get_page_id( 'shop' );
+    $_menu   = get_post_meta( $shop_id, '_gsm_menu', true );
+    $shop_id = function_exists( 'wc_get_page_id' ) ? wc_get_page_id( 'shop' ) : woocommerce_get_page_id( 'shop' );
+    if ( is_post_type_archive( 'product' ) && $_menu = get_post_meta( $shop_id, $field_name, true ) )
+    if ( is_post_type_archive( 'product' ) && $_menu ) {
         $mods['secondary'] = (int) $_menu;
+    }
     return $mods;

genesis-connect-woocommerce/tags/1.1.0/sp-plugins-integration/genesis-simple-sidebars.php

-                      r1921233
+                      r2123371
 <?php
 /**
  * Integration - Genesis Simple Sidebars
+ * Genesis Simple Sidebars integration.
+ *
+ * @package genesis_connect_woocommerce
+ * @version 0.9.8
+ *
+ * @package Genesis_Connect_WooCommerce
  * @since 0.9.0
+ *
  * Based on Genesis Simple Sidebars (GSS) version 0.9.2
+ * Based on Genesis Simple Sidebars (GSS) version 0.9.2.
+ *
  * What GCW integration needs to do:
  *  1. add_post_type_support for 'genesis-simple-sidebars'
  *  2. deal with serving correct GSS sidebar(s) for Shop page (product archive)
+ *  1. Add_post_type_support for 'genesis-simple-sidebars'.
+ *  2. Deal with serving correct GSS sidebar(s) for Shop page (product archive).
+ *
  * What GCW does:
  *  1. GCW adds post_type_support for GSS - see gencwooc_setup()
  *  2. intercepts GSS sidebar loading functions, deals with Shop Page,
  * then hands back control of sidebar loading in all other cases to GSS
+ *  1. GCW adds post_type_support for GSS - see gencwooc_setup().
+ *  2. Intercepts GSS sidebar loading functions, deals with Shop Page,
+ * then hands back control of sidebar loading in all other cases to GSS.
+ *
+ * Note: this file is loaded on the 'after_theme_setup' hook only if GSS
+ * is activated.
+ * Note: this file is loaded on the 'after_theme_setup' hook only if GSS is activated.
  * @see gencwooc_setup() in genesis-connect-woocommerce.php
+ *
- * @TODO simply these functions
  */
+/**
+ * Prevent direct access to this file
+ */
+if ( ! defined( 'ABSPATH' ) )
+    exit( __( 'Sorry, you are not allowed to access this file directly.', 'genwooc' ) );
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 add_action( 'get_header', 'gencwooc_ss_handler', 11 );
 /**
  * Take control of GSS sidebar loading
+ * Take control of GSS sidebar loading.
+ *
+ * Hooked to 'get_header' with priority of 11 to ensure that GSS's
+ * actions, which are unhooked here in this function, have been added
+ * and therefore can be removed.
+ * Hooked to 'get_header' with priority of 11 to ensure that GSS's actions, which are unhooked
+ * here in this function, have been added and therefore can be removed.
+ *
+ * Unhooks GSS ss_do_sidebar() and ss_do_sidebar_alt() functions and
+ * hooks GCW versions of these functions to the same hooks instead.
+ * Unhooks GSS ss_do_sidebar() and ss_do_sidebar_alt() functions and hooks GCW versions of
+ * these functions to the same hooks instead.
+ *
  * @see GSS ss_sidebars_init() in genesis-simple-sidebars/plugin.php
+ *
  * Note for developers:
  * ====================
  * If you want to do more complex manipulations of sidebars, eg load another one
  * altogether (ie not a GSS sidebar, G Sidebar or G Sidebar Alt), unhook this
  * function and replace it with your own version.
+ * If you want to do more complex manipulations of sidebars, eg load another one altogether
+ * (ie not a GSS sidebar, G Sidebar or G Sidebar Alt), unhook this function and replace it with
+ * your own version.
+ *
  * @since 0.9.0
+ *
  */
 function gencwooc_ss_handler() {
-    /** Unhook GSS functions */
     remove_action( 'genesis_sidebar', 'ss_do_sidebar' );
     remove_action( 'genesis_sidebar_alt', 'ss_do_sidebar_alt' );
-    /** Hook replacement functions */
     add_action( 'genesis_sidebar', 'gencwooc_ss_do_sidebar' );
     add_action( 'genesis_sidebar_alt', 'gencwooc_ss_do_sidebar_alt' );
 …
 /**
  * Callback for dealing with Primary Sidebar loading
+ * Callback for dealing with Primary Sidebar loading.
+ *
  * Intercepts GSS code flow, so that Shop page can be dealt with, then
  * hands back control to the GSS function for loading primary sidebars.
  * Effectively, it's just a more complex version of ss_do_sidebar()
+ * Intercepts GSS code flow, so that Shop page can be dealt with, then hands back control to the
+ * GSS function for loading primary sidebars. Effectively, it's just a more complex version
+ * of ss_do_sidebar().
+ *
+ * Checks if we're on the product archive and a GSS sidebar has been
+ * assigned in the Shop WP Page editor, then, if both true, loads the relevant
+ * GSS sidebar on the Shop Page.
+ * Checks if we're on the product archive and a GSS sidebar has been assigned in the
+ * Shop WP Page editor, then, if both true, loads the relevant GSS sidebar on the Shop Page.
+ *
  * If either of the above conditions return false, we load the regular sidebar.
 …
+ *
  * @uses woocommerce_get_page_id()
+ *
  */
 function gencwooc_ss_do_sidebar() {
-    $bar = '_ss_sidebar';
     $shop_id = function_exists( 'wc_get_page_id' ) ? wc_get_page_id( 'shop' ) : woocommerce_get_page_id( 'shop' );
+    $_bar    = get_post_meta( $shop_id, '_ss_sidebar', true );
+    if ( is_post_type_archive( 'product' ) && $_bar = get_post_meta( $shop_id, $bar, true ) ) {
+    if ( is_post_type_archive( 'product' ) && $_bar ) {
         dynamic_sidebar( $_bar );
     } else {
         genesis_do_sidebar();
+    }
 …
 /**
  * Callback for dealing with Sidebar Alt loading
+ * Callback for dealing with Sidebar Alt loading.
+ *
  * Intercepts GSS code flow, so that Shop page can be dealt with, then
  * hands back control to the GSS function for loading secondary sidebars.
  * Effectively, it's just a more complex version of ss_do_sidebar_alt()
+ * Intercepts GSS code flow, so that Shop page can be dealt with, then hands back control to the
+ * GSS function for loading secondary sidebars. Effectively, it's just a more complex version
+ * of ss_do_sidebar_alt().
+ *
+ * Checks if we're on the product archive and a GSS sidebar has been
+ * assigned in the Shop WP Page editor, then, if both true, loads the relevant
+ * GSS sidebar on the Shop Page.
+ * Checks if we're on the product archive and a GSS sidebar has been assigned in the
+ * Shop WP Page editor, then, if both true, loads the relevant GSS sidebar on the Shop Page.
+ *
  * If either of the above conditions return false, we load the regular alt sidebar.
 …
+ *
  * @uses woocommerce_get_page_id()
+ *
  */
 function gencwooc_ss_do_sidebar_alt() {
-    $bar = '_ss_sidebar_alt';
     $shop_id = function_exists( 'wc_get_page_id' ) ? wc_get_page_id( 'shop' ) : woocommerce_get_page_id( 'shop' );
+    $_bar    = get_post_meta( $shop_id, '_ss_sidebar_alt', true );
+    if ( is_post_type_archive( 'product' ) && $_bar = get_post_meta( $shop_id, $bar, true ) ) {
+    if ( is_post_type_archive( 'product' ) && $_bar ) {
         dynamic_sidebar( $_bar );
     } else {
         genesis_do_sidebar_alt();
+    }

genesis-connect-woocommerce/tags/1.1.0/templates/archive-product.php

-                      r1921233
+                      r2123371
 <?php
 /**
  * This template displays the archive for Products
+ * This template displays the archive for Products.
+ *
  * @package genesis_connect_woocommerce
+ * @package Genesis_Connect_WooCommerce
  * @version 0.9.8
+ * @since 0.9.0
+ *
  * Note for customisers/users: Do not edit this file!
 …
  * The version in the child theme's woocommerce folder will override this template, and
  * any future updates to this plugin won't wipe out your customisations.
+ *
- * @since 0.9.0
+ *
  */
+/** Remove default Genesis loop */
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 remove_action( 'genesis_loop', 'genesis_do_loop' );
-/** Remove Genesis archive title/description */
 remove_action( 'genesis_before_loop', 'genesis_do_taxonomy_title_description', 15 );
-/** Remove WooCommerce breadcrumbs */
 remove_action( 'woocommerce_before_main_content', 'woocommerce_breadcrumb', 20 );
-/** Uncomment the below line of code to add back WooCommerce breadcrumbs */
-//add_action( 'genesis_before_loop', 'woocommerce_breadcrumb', 10, 0 );
-/** Remove Woo #container and #content divs */
 remove_action( 'woocommerce_before_main_content', 'woocommerce_output_content_wrapper', 10 );
 remove_action( 'woocommerce_after_main_content', 'woocommerce_output_content_wrapper_end', 10 );
 …
  * @since 0.9.0
+ *
+ * @param str $layout Current Genesis page layout, such as 'content-sidebar'.
+ * @return str Page layout if set for the shop page, otherwise the default site layout.
+ * @param string $layout Current Genesis page layout, such as 'content-sidebar'.
+ *
+ * @return string Page layout if set for the shop page, otherwise the default site layout.
  */
 function genesiswooc_archive_layout( $layout ) {
 …
  * Display shop items (product custom post archive)
+ *
+ * This function has been refactored in 0.9.4 to provide compatibility with
+ * both WooC 1.6.0 and backwards compatibility with older versions.
+ * This is needed thanks to substantial changes to WooC template contents
+ * introduced in WooC 1.6.0.
+ * This function has been refactored in 0.9.4 to provide compatibility with both WooCommerce 1.6.0
+ * and backwards compatibility with older versions.
+ *
+ * @uses genesiswooc_content_product() if WooC is version 1.6.0+
+ * @uses genesiswooc_product_archive() for earlier WooC versions
+ * This is needed thanks to substantial changes to WooCommerce template contents introduced in
+ * WooCommerce 1.6.0.
+ *
+ * @uses genesiswooc_content_product() if WooCommerce is version 1.6.0+
+ * @uses genesiswooc_product_archive() for earlier WooCommerce versions
+ *
  * @since 0.9.0
  * @updated 0.9.4
  * @global object $woocommerce
+ *
+ * @global WooCommerce $woocommerce Current WooCommerce instance.
  */
 function genesiswooc_archive_product_loop() {
 …
     $new = version_compare( $woocommerce->version, '1.6.0', '>=' );
     if ( $new )
+    if ( $new ) {
         genesiswooc_content_product();
+    } else {
+        genesiswooc_product_archive();
+    }
-    else
-        genesiswooc_product_archive();
+}

genesis-connect-woocommerce/tags/1.1.0/templates/single-product.php

-                      r1921233
+                      r2123371
 <?php
 /**
  * This template displays the single Product
+ * This template displays the single Product.
+ *
  * @package genesis_connect_woocommerce
+ * @package Genesis_Connect_WooCommerce
  * @version 0.9.8
+ * @since 0.9.0
+ *
  * Note for customisers/users: Do not edit this file!
 …
  * The version in the child theme's woocommerce folder will override this template, and
  * any future updates to this plugin won't wipe out your customisations.
+ *
  */
+/** Remove default Genesis loop */
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 remove_action( 'genesis_loop', 'genesis_do_loop' );
-/** Remove WooCommerce breadcrumbs */
 remove_action( 'woocommerce_before_main_content', 'woocommerce_breadcrumb', 20 );
-/** Uncomment the below line of code to add back WooCommerce breadcrumbs */
-//add_action( 'genesis_before_loop', 'woocommerce_breadcrumb', 10, 0 );
-/** Remove Woo #container and #content divs */
 remove_action( 'woocommerce_before_main_content', 'woocommerce_output_content_wrapper', 10 );
 remove_action( 'woocommerce_after_main_content', 'woocommerce_output_content_wrapper_end', 10 );
 add_action( 'genesis_loop', 'gencwooc_single_product_loop' );
 /**
  * Displays single product loop
+ * Displays single product loop.
+ *
  * Uses WooCommerce structure and contains all existing WooCommerce hooks
+ * Uses WooCommerce structure and contains all existing WooCommerce hooks.
+ *
+ * Code based on WooCommerce 1.5.5 woocommerce_single_product_content()
+ * Code based on WooCommerce 1.5.5 woocommerce_single_product_content().
+ *
  * @see woocommerce/woocommerce-template.php
+ *
 …
     do_action( 'woocommerce_before_main_content' );
+    // Let developers override the query used, in case they want to use this function for their own loop/wp_query
+    $wc_query = false;
+    $wc_query = apply_filters( 'gencwooc_custom_query', false );
+    // Added a hook for developers in case they need to modify the query
+    $wc_query = apply_filters( 'gencwooc_custom_query', $wc_query );
+    if ( ! $wc_query) {
+    if ( ! $wc_query ) {
         global $wp_query;
 …
+    }
+    if ( $wc_query->have_posts() ) while ( $wc_query->have_posts() ) : $wc_query->the_post(); ?>
+    if ( $wc_query->have_posts() ) {
+        while ( $wc_query->have_posts() ) {
+            $wc_query->the_post();
+        <?php do_action('woocommerce_before_single_product'); ?>
+            do_action( 'woocommerce_before_single_product' );
+            ?>
+        <div id="product-<?php the_ID(); ?>" <?php post_class(); ?>>
+            <div id="product-<?php the_ID(); ?>" <?php post_class(); ?>>
+                <?php do_action( 'woocommerce_before_single_product_summary' ); ?>
+            <?php do_action( 'woocommerce_before_single_product_summary' ); ?>
+                <div class="summary">
+                    <?php do_action( 'woocommerce_single_product_summary' ); ?>
+                </div>
+            <div class="summary">
+                <?php do_action( 'woocommerce_single_product_summary'); ?>
+                <?php do_action( 'woocommerce_after_single_product_summary' ); ?>
             </div>
+            <?php do_action( 'woocommerce_after_single_product_summary' ); ?>
+        </div>
+        <?php do_action( 'woocommerce_after_single_product' );
+    endwhile;
+            <?php
+            do_action( 'woocommerce_after_single_product' );
+        }
+    }
     do_action( 'woocommerce_after_main_content' );
+}

genesis-connect-woocommerce/tags/1.1.0/templates/taxonomy.php

-                      r1921233
+                      r2123371
 <?php
 /**
  * This template displays the Product Category and Tag taxonomy term archives
+ * This template displays the Product Category and Tag taxonomy term archives.
+ *
  * @package genesis_connect_woocommerce
+ * @package Genesis_Connect_WooCommerce
  * @version 0.9.8
+ * @since 0.9.0
+ *
  * Note for customisers/users: Do not edit this file!
 …
  * The version in the child theme's woocommerce folder will override this template, and
  * any future updates to this plugin won't wipe out your customisations.
+ *
  */
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
-/** Remove default Genesis loop */
 remove_action( 'genesis_loop', 'genesis_do_loop' );
+remove_action( 'woocommerce_archive_description', 'woocommerce_taxonomy_archive_description' );
+remove_action( 'woocommerce_before_main_content', 'woocommerce_breadcrumb', 20 );
+remove_action( 'woocommerce_before_main_content', 'woocommerce_output_content_wrapper', 10 );
+remove_action( 'woocommerce_after_main_content', 'woocommerce_output_content_wrapper_end', 10 );
-// Remove the WooCommerce archive title and description.
 add_filter( 'woocommerce_show_page_title', '__return_false' );
-remove_action( 'woocommerce_archive_description', 'woocommerce_taxonomy_archive_description' );
 add_filter( 'genesis_term_intro_text_output', 'genesiswooc_term_intro_text_output' );
 …
  * Fall back to the archive description if no intro text is set.
+ *
+ * @since 1.0.0
+ *
  * @param string $intro_text The default Genesis archive intro text.
+ *
  * @return string Archive intro text, or archive description if no intro text set.
+ *
- * @since 1.0
  */
 function genesiswooc_term_intro_text_output( $intro_text ) {
     $wp_archive_description = get_the_archive_description();
 …
     return $intro_text;
+}
-/** Remove WooCommerce breadcrumbs */
-remove_action( 'woocommerce_before_main_content', 'woocommerce_breadcrumb', 20 );
-/** Uncomment the below line of code to add back WooCommerce breadcrumbs */
-//add_action( 'genesis_before_loop', 'woocommerce_breadcrumb', 10, 0 );
-/** Remove Woo #container and #content divs */
-remove_action( 'woocommerce_before_main_content', 'woocommerce_output_content_wrapper', 10 );
-remove_action( 'woocommerce_after_main_content', 'woocommerce_output_content_wrapper_end', 10 );
 add_action( 'genesis_loop', 'genesiswooc_product_taxonomy_loop' );
 /**
  * Displays shop items for the queried taxonomy term
+ * Displays shop items for the queried taxonomy term.
+ *
  * This function has been refactored in 0.9.4 to provide compatibility with
  * both WooC 1.6.0 and backwards compatibility with older versions.
  * This is needed thanks to substantial changes to WooC template contents
  * introduced in WooC 1.6.0.
+ * both WooCommerce 1.6.0 and backwards compatibility with older versions.
+ * This is needed thanks to substantial changes to WooCommerce template contents
+ * introduced in WooCommerce 1.6.0.
+ *
+ * @uses genesiswooc_content_product() if WooC is version 1.6.0+
+ * @uses genesiswooc_product_taxonomy() for earlier WooC versions
+ * @global $woocommerce $woocommerce The WooCommerce instance.
+ *
+ * @uses genesiswooc_content_product() if WooCommerce is version 1.6.0+
+ * @uses genesiswooc_product_taxonomy() for earlier WooCommerce versions
+ *
  * @since 0.9.0
- * @updated 0.9.4
  */
 function genesiswooc_product_taxonomy_loop() {
 …
     $new = version_compare( $woocommerce->version, '1.6.0', '>=' );
     if ( $new )
+    if ( $new ) {
         genesiswooc_content_product();
+    else
+    } else {
         genesiswooc_product_taxonomy();
+    }
+}

genesis-connect-woocommerce/trunk

Property svn:ignore

-                      old
+                      new
+.editorconfig
 .git
 .gitignore
 .gitattributes
 .svnignore
+composer.json
+composer.lock
 node_modules
+phpcs.xml.dist
+vendor

genesis-connect-woocommerce/trunk/admin/notices.php

-                      r1921233
+                      r2123371
  * Callbacks for `admin_notices` action to load HTML notices.
+ *
  * @package genesis_connect_woocommerce
  * @version 1.0
+ * @package Genesis_Connect_WooCommerce
+ * @since 1.0
  */
-defined( 'ABSPATH' ) || exit;
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
+/**
+ * Display notice message if WooCommerce is not active.
+ *
+ * Callback for WordPress 'admin_notices' action.
+ *
+ * @since 1.0
+ */
 function gencwooc_woocommerce_notice() {
     include GCW_ADMIN_DIR . '/views/html-notice-needs-woocommerce.php';
+}
+/**
+ * Display notice message if Genesis is not active.
+ *
+ * Callback for WordPress 'admin_notices' action.
+ *
+ * @since 1.0
+ */
 function gencwooc_genesis_notice() {
     include GCW_ADMIN_DIR . '/views/html-notice-needs-genesis.php';

genesis-connect-woocommerce/trunk/admin/views/html-notice-needs-genesis.php

-                      r1921233
+                      r2123371
 <?php
 /**
+ * Admin View: Notice - needs Genesis.
+ * View for WordPress `admin_notice` if Genesis is not active.
+ *
+ * @package Genesis_Connect_WooCommerce
+ * @since 1.0.0
  */
+defined( 'ABSPATH' ) || exit;
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 ?>
 <div id="message" class="error notice">
+    <p><?php _e( '<i>Genesis Connect for WooCommerce</i> requires a Genesis child theme. <strong>Please activate a Genesis theme or disable Genesis Connect.</strong>', 'gencwooc' ); ?></p>
+    <p>
+        <?php esc_html_e( 'Genesis Connect for WooCommerce requires a Genesis child theme. Please activate a Genesis theme or disable Genesis Connect.', 'gencwooc' ); ?>
+    </p>
 </div>

genesis-connect-woocommerce/trunk/admin/views/html-notice-needs-woocommerce.php

-                      r1921233
+                      r2123371
 <?php
 /**
+ * Admin View: Notice - needs WooCommerce.
+ * View for WordPress `admin_notice` if WooCommerce is not active.
+ *
+ * @package Genesis_Connect_WooCommerce
+ * @since 1.0.0
  */
+defined( 'ABSPATH' ) || exit;
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 ?>
 <div id="message" class="error notice">
+    <p><?php _e( '<i>Genesis Connect for WooCommerce</i> requires WooCommerce. <strong>Please activate WooCommerce or disable Genesis Connect.</strong>', 'gencwooc' ); ?></p>
+    <p>
+        <?php esc_html_e( 'Genesis Connect for WooCommerce requires WooCommerce. Please activate WooCommerce or disable Genesis Connect.', 'gencwooc' ); ?>
+    </p>
 </div>

genesis-connect-woocommerce/trunk/genesis-connect-woocommerce.php

-                      r1921233
+                      r2123371
 <?php
+/*
+Plugin Name: Genesis Connect for WooCommerce
+Plugin URI: https://wordpress.org/plugins/genesis-connect-woocommerce/
+Version: 1.0
+Author: StudioPress
+Author URI: https://www.studiopress.com/
+Description: Allows you to seamlessly integrate WooCommerce with the Genesis Framework and Genesis child themes.
+WC requires at least: 3.3.0
+WC tested up to: 3.4
+/**
+ * Plugin Name: Genesis Connect for WooCommerce
+ * Plugin URI: https://wordpress.org/plugins/genesis-connect-woocommerce/
+ * Version: 1.1.0
+ * Author: StudioPress
+ * Author URI: https://www.studiopress.com/
+ * Description: Allows you to seamlessly integrate WooCommerce with the Genesis Framework and Genesis child themes.
+ * Text Domain: gencwooc
+ * License: GNU General Public License v2.0 (or later)
+ * License URI: http://www.opensource.org/licenses/gpl-license.php
+ *
+ * WC requires at least: 3.3.0
+ * WC tested up to: 3.6.4
+ *
+ * @package Genesis_Connect_WooCommerce
+ *
+ * Special thanks to Ade Walker (http://www.studiograsshopper.ch/) for his contributions to this plugin.
+ */
+License: GNU General Public License v2.0 (or later)
+License URI: http://www.opensource.org/licenses/gpl-license.php
+Special thanks to Ade Walker (http://www.studiograsshopper.ch/) for his contributions to this plugin.
+*/
+/** Define the Genesis Connect for WooCommerce constants */
+define( 'GCW_DIR', dirname( __FILE__ ) );
 define( 'GCW_TEMPLATE_DIR', dirname( __FILE__ ) . '/templates' );
 define( 'GCW_LIB_DIR', dirname( __FILE__ ) . '/lib');
 define( 'GCW_ADMIN_DIR', dirname( __FILE__ ) . '/admin');
+define( 'GCW_LIB_DIR', dirname( __FILE__ ) . '/lib' );
+define( 'GCW_ADMIN_DIR', dirname( __FILE__ ) . '/admin' );
 define( 'GCW_WIDGETS_DIR', dirname( __FILE__ ) . '/widgets' );
 define( 'GCW_SP_DIR', dirname( __FILE__ ) . '/sp-plugins-integration' );
 …
 add_action( 'after_setup_theme', 'gencwooc_setup' );
 /**
  * Setup GCW
+ * Setup Genesis Connect for WooCommerce.
+ *
  * Checks whether WooCommerce is active, then checks if relevant
  * theme support exists. Once past these checks, loads the necessary
  * files, actions and filters for the plugin to do its thing.
+ * Checks whether WooCommerce is active.
+ * Once past these checks, loads the necessary files, actions and filters for the plugin
+ * to do its thing.
+ *
  * @since 0.9.0
 …
     require_once GCW_ADMIN_DIR . '/notices.php';
     $ready = true;
     if ( ! function_exists( 'is_plugin_active' ) ) {
         require_once( ABSPATH . '/wp-admin/includes/plugin.php' );
+        require_once ABSPATH . '/wp-admin/includes/plugin.php';
+    }
     if ( ! is_plugin_active( 'woocommerce/woocommerce.php' ) ) {
         add_action( 'admin_notices', 'gencwooc_woocommerce_notice' );
         $ready = false;
+    }
 …
     global $woocommerce;
+    /** Load GCW files */
+    require_once( GCW_LIB_DIR . '/template-loader.php' );
+    require_once GCW_LIB_DIR . '/template-loader.php';
+    require_once GCW_LIB_DIR . '/posts-per-page.php';
+    require_once GCW_LIB_DIR . '/widgets.php';
+    // Load posts per page option
+    require_once( GCW_LIB_DIR . '/posts-per-page.php' );
+    if ( ! current_theme_supports( 'gencwooc-woo-breadcrumbs' ) ) {
+        require_once GCW_LIB_DIR . '/breadcrumb.php';
+    }
-    /** Load modified Genesis breadcrumb filters and callbacks */
-    if ( ! current_theme_supports( 'gencwooc-woo-breadcrumbs') )
-        require_once( GCW_LIB_DIR . '/breadcrumb.php' );
-    /** Ensure WooCommerce 2.0+ compatibility */
     add_theme_support( 'woocommerce' );
-    /** Add Genesis Layout, Genesis Scripts and SEO options to Product edit screen */
     add_post_type_support( 'product', array( 'genesis-layouts', 'genesis-scripts', 'genesis-seo' ) );
-    /** Add Studiopress plugins support */
     add_post_type_support( 'product', array( 'genesis-simple-sidebars', 'genesis-simple-menus' ) );
-    /** Add Widgets */
     if ( current_theme_supports( 'gencwooc-featured-products-widget' ) ) {
         require_once( GCW_WIDGETS_DIR . '/woocommerce-featured-widgets.php' );
+        require_once GCW_WIDGETS_DIR . '/class-gencwooc-featured-products.php';
+    }
-    /** Take control of shop template loading */
     remove_filter( 'template_include', array( &$woocommerce, 'template_loader' ) );
     add_filter( 'template_include', 'gencwooc_template_loader', 20 );
-    /** Integration - Genesis Simple Sidebars */
     if ( is_plugin_active( 'genesis-simple-sidebars/plugin.php' ) ) {
         require_once( GCW_SP_DIR . '/genesis-simple-sidebars.php' );
+        require_once GCW_SP_DIR . '/genesis-simple-sidebars.php';
+    }
-    /** Integration - Genesis Simple Menus */
     if ( is_plugin_active( 'genesis-simple-menus/simple-menu.php' ) ) {
         require_once( GCW_SP_DIR . '/genesis-simple-menus.php' );
+        require_once GCW_SP_DIR . '/genesis-simple-menus.php';
+    }
+}
+add_action( 'plugins_loaded', 'gencwooc_load_plugin_textdomain' );
+/**
+ * Load plugin translated strings.
+ *
+ * Callback for WordPress 'plugins_loaded' action.
+ *
+ * @uses load_plugin_textdomain()
+ * @link https://codex.wordpress.org/Function_Reference/load_plugin_textdomain
+ *
+ * @since 1.1.0
+ */
+function gencwooc_load_plugin_textdomain() {
+    load_plugin_textdomain( 'gencwooc', false, GCW_DIR . '/languages' );
+}

genesis-connect-woocommerce/trunk/lib/breadcrumb.php

-                      r1812865
+                      r2123371
 <?php
 /**
+ * This file contains functions related modifying Genesis Breadcrumb output
+ *
+ * @package genesis_connect_woocommerce
+ * @version 0.9.8
+ *
+ * @since 0.9.0
+ *
+ *
+ * By default, the Genesis Breadcrumb class does not handle Shop pages and taxonomy
+ * archives in the same way as WooC's breadcrumbs. These filters and callback
+ * functions modify the default Genesis breadcrumb output so that the breadcrumb
+ * trail mimics that of WooC's breadcrumbs, for:
+ * This file contains functions related modifying Genesis Breadcrumb output.
+ *
+ * @package Genesis_Connect_WooCommerce
+ * @since 0.9.0
+ *
+ *
+ * By default, the Genesis Breadcrumb class does not handle Shop pages and taxonomy archives in the
+ * same way as WooCommerce breadcrumbs. These filters and callback functions modify the default Genesis
+ * breadcrumb output so that the breadcrumb trail mimics that of WooCommerce breadcrumbs for:
  * - Shop page (archive page)
  * - Single product
  * - Taxonomy archive
+ *
  * Users who prefer to use WooC's breadcrumbs can do so by adding this to their child
+ * Users who prefer to use WooCommerce breadcrumbs can do so by adding this to their child
  * theme's functions.php:
  * - add_theme_support( 'gencwooc-woo-breadcrumbs' );
 …
  * - remove_action( 'genesis_before_loop', 'genesis_do_breadcrumbs' );
+ *
  * @see readme.txt for more details
+ * @see readme.txt For more details.
+ *
  * As this modification code uses existing Genesis Breadcrumb filters there is a risk that
 …
  * @see genesis/lib/classes/breadcrumb.php v1.8
  * @see woocommerce/templates/shop/breadcrumb.php v1.4.4
+ *
+ * @TODO Replace with subclass of Genesis_Breadcrumb?
+ */
+/**
+ * Prevent direct access to this file
+ */
+if ( ! defined( 'ABSPATH' ) )
+    exit( __( 'Sorry, you are not allowed to access this file directly.' ) );
+ */
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 add_filter( 'genesis_archive_crumb', 'gencwooc_get_archive_crumb_filter', 10, 2 );
 /**
  * Filter the Genesis Breadcrumbs archive crumb
+ *
  * Needed for Product Archive (Shop page) and Taxonomy archives
+ * Filter the Genesis Breadcrumbs archive crumb.
+ *
+ * Needed for Product Archive (Shop page) and Taxonomy archives.
+ *
  * Note: relevant WooCommerce settings (WooCommerce > Settings > Pages tab):
 …
+ *
  * @since 0.9.0
  * @updated 0.9.7
+ *
  * @param str $crumb Breadcrumb 'crumb' for archives
  * @param array $args Genesis Breadcrumb args
  * @return str $crumb, either modified $crumb, or original $crumb
+ *
+ * @param string $crumb Breadcrumb 'crumb' for archives.
+ * @param array  $args Genesis Breadcrumb args.
+ *
+ * @return string $crumb Breadcrumb 'crumb' for archives.
  */
 function gencwooc_get_archive_crumb_filter( $crumb, $args ) {
+    /** Are we on the product archive page? */
+    if ( is_post_type_archive( 'product') && get_option( 'page_on_front' ) !== wc_get_page_id( 'shop' ) ) {
+        $shop_id = wc_get_page_id( 'shop' );
+        $shop_name = $shop_id ? get_the_title( $shop_id ) : ucwords( get_option('woocommerce_shop_slug') );
+        if ( is_search() ) :
+            $crumb = gencwooc_get_crumb_link( get_post_type_archive_link( 'product' ), $shop_name, $shop_name, $args['sep'] . __( 'Search results for &ldquo;', 'woocommerce' ) . get_search_query() . '&rdquo;' );
+        else :
+            $crumb = $shop_name;
+        endif;
+    if ( is_post_type_archive( 'product' ) && get_option( 'page_on_front' ) !== wc_get_page_id( 'shop' ) ) {
+        $shop_id   = wc_get_page_id( 'shop' );
+        $shop_name = $shop_id ? get_the_title( $shop_id ) : ucwords( get_option( 'woocommerce_shop_slug' ) );
+        $crumb     = $shop_name;
+        if ( is_search() ) {
+            $crumb = gencwooc_get_crumb_link(
+                get_post_type_archive_link( 'product' ),
+                $shop_name,
+                $shop_name,
+                $args['sep'] . __( 'Search results for &ldquo;', 'gencwooc' ) . get_search_query() . '&rdquo;'
+            );
+        }
         return apply_filters( 'gencwooc_product_archive_crumb', $crumb, $args );
+    }
-    /** Are we on a shop taxonomy archive page? */
     if ( is_tax( 'product_cat' ) || is_tax( 'product_tag' ) ) {
+        $crumb = '';
+        $prepend = '';
+        /** Should we prepend crumb with 'shop' page link? */
+        /** See Dashboard > WooC Settings > Pages tab */
+        $shop_url = get_option( 'woocommerce_prepend_shop_page_to_urls' );
+        $shop_id = wc_get_page_id( 'shop' );
+        $crumb      = '';
+        $prepend    = '';
+        $shop_url   = get_option( 'woocommerce_prepend_shop_page_to_urls' );
+        $shop_id    = wc_get_page_id( 'shop' );
         $shop_title = get_the_title( $shop_id );
         if ( 'yes' == $shop_url && $shop_id && get_option( 'page_on_front' ) !== $shop_id )
+        if ( 'yes' === $shop_url && $shop_id && get_option( 'page_on_front' ) !== $shop_id ) {
             $prepend = gencwooc_get_crumb_link( get_permalink( $shop_id ), $shop_title, $shop_title, $args['sep'] );
+        }
+    }
     if ( is_tax( 'product_cat' ) ) {
+        $term = get_term_by( 'slug', get_query_var( 'term' ), get_query_var( 'taxonomy' ) );
+        $term    = get_term_by( 'slug', get_query_var( 'term' ), get_query_var( 'taxonomy' ) );
         $parents = array();
+        $parent = $term->parent;
+        while ( $parent ):
+            $parents[] = $parent;
+        $parent  = $term->parent;
+        while ( $parent ) {
+            $parents[]  = $parent;
             $new_parent = get_term_by( 'id', $parent, get_query_var( 'taxonomy' ) );
             $parent = $new_parent->parent;
         endwhile;
+            $parent     = $new_parent->parent;
+        }
         $crumb .= $prepend;
         if ( ! empty( $parents ) ) :
+        if ( ! empty( $parents ) ) {
             $parents = array_reverse( $parents );
+            foreach ( $parents as $parent ) :
+                $item = get_term_by( 'id', $parent, get_query_var( 'taxonomy' ) );
+            foreach ( $parents as $parent ) {
+                $item   = get_term_by( 'id', $parent, get_query_var( 'taxonomy' ) );
                 $crumb .= gencwooc_get_crumb_link( get_term_link( $item->slug, 'product_cat' ), $item->name, $item->name, $args['sep'] );
             endforeach;
         endif;
+            }
+        }
         $crumb .= single_term_title( '', false );
 …
     if ( is_tax( 'product_tag' ) ) {
         $crumb .= $prepend . __( 'Products tagged &ldquo;', 'gencwooc' ) . single_term_title( '', false ) . _x( '&rdquo;', 'endquote', 'gencwooc' );
 …
+    }
-    /** Original unmodified */
     return $crumb;
+}
+}
 add_filter( 'genesis_single_crumb', 'gencwooc_get_single_crumb', 10, 2 );
 /**
+ * Filter the Genesis Breadcrumbs singular crumb
+ *
+ * Needed for single Product pages
+ *
+ * @since 0.9.0
+ *
+ * @param str $crumb Breadcrumb 'crumb' for single posts
+ * @param array $args Genesis Breadcrumb args
+ * @return str $crumb, either modified $crumb, or original $crumb
+ * Filter the Genesis Breadcrumbs singular crumb.
+ *
+ * Needed for single Product pages.
+ *
+ * @since 0.9.0
+ *
+ * @global WP_Post $post The current WP_Post.
+ *
+ * @param string $crumb Breadcrumb 'crumb' for single posts.
+ * @param array  $args  Genesis Breadcrumb args.
+ *
+ * @return string $crumb Breadcrumb 'crumb' for single posts.
  */
 function gencwooc_get_single_crumb( $crumb, $args ) {
-    /** Are we on a single product page? */
     if ( is_singular( 'product' ) ) {
         global $post;
+        $crumb = '';
+        $prepend = '';
+        /** Should we prepend crumb with 'shop' page link? */
+        /** See Dashboard > WooC Settings > Pages tab */
+        $shop_url = get_option( 'woocommerce_prepend_shop_page_to_urls' );
+        $shop_id = wc_get_page_id( 'shop' );
+        $crumb      = '';
+        $prepend    = '';
+        $shop_url   = get_option( 'woocommerce_prepend_shop_page_to_urls' );
+        $shop_id    = wc_get_page_id( 'shop' );
         $shop_title = get_the_title( $shop_id );
         if ( 'yes' == $shop_url && $shop_id && get_option( 'page_on_front' ) !== $shop_id )
+        if ( 'yes' === $shop_url && $shop_id && get_option( 'page_on_front' ) !== $shop_id ) {
             $prepend = gencwooc_get_crumb_link( get_permalink( $shop_id ), $shop_title, $shop_title, $args['sep'] );
+        }
         $crumb .= $prepend;
+        if ( $terms = wp_get_object_terms( $post->ID, 'product_cat' ) ) :
+            $term = current( $terms );
+        $terms  = wp_get_object_terms( $post->ID, 'product_cat' );
+        if ( $terms ) {
+            $term    = current( $terms );
             $parents = array();
+            $parent = $term->parent;
+            while ( $parent ):
+                $parents[] = $parent;
+            $parent  = $term->parent;
+            while ( $parent ) {
+                $parents[]  = $parent;
                 $new_parent = get_term_by( 'id', $parent, 'product_cat' );
                 $parent = $new_parent->parent;
             endwhile;
             if( ! empty( $parents ) ):
+                $parent     = $new_parent->parent;
+            }
+            if ( ! empty( $parents ) ) {
                 $parents = array_reverse( $parents );
+                foreach ( $parents as $parent ) :
+                    $item = get_term_by( 'id', $parent, 'product_cat' );
+                foreach ( $parents as $parent ) {
+                    $item   = get_term_by( 'id', $parent, 'product_cat' );
                     $crumb .= gencwooc_get_crumb_link( get_term_link( $item->slug, 'product_cat' ), $item->name, $item->name, $args['sep'] );
+                endforeach;
+            endif;
+                }
+            }
             $crumb .= gencwooc_get_crumb_link( get_term_link( $term->slug, 'product_cat' ), $term->name, $term->name, $args['sep'] );
         endif;
+        }
         $crumb .= get_the_title();
 …
+    }
-    /** Fallback - original unmodified */
     return $crumb;
+}
+}
 /**
  * Helper function to create anchor link for a single crumb.
+ *
+ * This is a copy of Genesis_Breadcrumb::get_breadcrumb_link() (G1.8)
+ *
+ * @since 0.9.0
+ *
+ * @param string $url URL for href attribute
+ * @param string $title title attribute
+ * @param string $content linked content
+ * @param string $sep Separator
+ * This is a copy of Genesis_Breadcrumb::get_breadcrumb_link() (G1.8).
+ *
+ * @since 0.9.0
+ *
+ * @param string $url     URL for href attribute.
+ * @param string $title   The title attribute.
+ * @param string $content The link content.
+ * @param string $sep     Separator. Default false.
+ *
  * @return string HTML markup for anchor link and optional separator.
  */
 function gencwooc_get_crumb_link( $url, $title, $content, $sep = false ) {
+    $link = sprintf( '<a href="%s" title="%s">%s</a>', esc_attr( $url ), esc_attr( $title ), esc_html( $content ) );
+    if ( $sep )
+    $link = sprintf(
+        '<a href="%s" title="%s">%s</a>',
+        esc_attr( $url ),
+        esc_attr( $title ),
+        esc_html( $content )
+    );
+    if ( $sep ) {
         $link .= $sep;
+    }
     return $link;

genesis-connect-woocommerce/trunk/lib/posts-per-page.php

-                      r1575771
+                      r2123371
 <?php
 /**
+ * These functions manage loading of plugin-specific addons to the WooCommerce
+ * settings page.
+ * These functions manage loading of plugin-specific addons to the WooCommerce settings page.
+ *
+ * @package genesis_connect_woocommerce
+ * @version 0.9.8
+ *
+ * @package Genesis_Connect_WooCommerce
  * @since 0.9.0
  */
+/**
+ * Prevent direct access to this file
+ */
+if ( ! defined( 'ABSPATH' ) )
+    exit( _( 'Sorry, you are not allowed to access this file directly.' ) );
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 add_filter( 'woocommerce_settings_tabs_array', 'genesis_connect_addon_tab', 50 );
 /*
+/**
  * Add a custom tab in the WooCommerce settings for Genesis Connect.
+ *
  * @since 1.0.0
+ *
+ * @param array $tabs Used to add a tab to the WooCommerce settings page.
+ *
  * @return array $tabs Used to add a tab to the WooCommerce settings page.
  */
 function genesis_connect_addon_tab( $tabs ) {
-    // Add our own section.
     $tabs['gencwooc'] = __( 'Genesis Connect Addons', 'gencwooc' );
     return $tabs;
 …
+ *
  * @since 1.0.0
- * @return array Multiple arrays holding our section information
  */
 function genesis_connect_settings_tab() {
     woocommerce_admin_fields( genesis_connect_get_settings() );
+    woocommerce_admin_fields( genesis_connect_get_settings() );
+}
 …
+ *
  * @since 1.0.0
- * @return array Settings to update.
  */
 function genesis_connect_update_settings() {
     woocommerce_update_options( genesis_connect_get_settings() );
+    woocommerce_update_options( genesis_connect_get_settings() );
+}
 …
+ *
  * @since 1.0.0
+ *
  * @return array $settings Array of our settings.
  */
 function genesis_connect_get_settings() {
+    $settings = array(
+    $settings = array(
         'gencwooc_section_title' => array(
             'name' => __( 'Genesis Connect Addons', 'gencwooc' ),
             'type' => 'title',
             'desc' => 'Set and save additional WooCommerce settings here.',
             'id'   => 'gencwooc_section_title'
+            'id'   => 'gencwooc_section_title',
         ),
         'products_per_page' => array(
+        'products_per_page'      => array(
             'name'    => __( 'Products Per Page', 'gencwooc' ),
             'type'    => 'number',
 …
             'id'      => 'gencwooc_products_per_page',
             'default' => apply_filters( 'genesiswooc_default_products_per_page', get_option( 'posts_per_page' ) ),
+        ),
+        'section_end' => array(
+             'type' => 'sectionend',
+             'id' => 'gencwooc_section_end'
+        )
+    );
+    return $settings;
+        ),
+        'section_end'            => array(
+            'type' => 'sectionend',
+            'id'   => 'gencwooc_section_end',
+        ),
+    );
+    return $settings;
+}
+add_filter( 'loop_shop_per_page', 'genesiswooc_products_per_page' );
 /**
+ * Execute settings on the frontend (this should probably
+ * go somewhere else other than this file).
+ * Execute settings on the frontend (this should probably go somewhere else other than this file).
+ *
  * @since 1.0.0
+ * @return array $q New query for the product page.
+ *
+ * @param integer $count Products per page to display.
+ *
+ * @return integer $count Products per page to display.
  */
-add_filter( 'loop_shop_per_page', 'genesiswooc_products_per_page' );
 function genesiswooc_products_per_page( $count ) {
+    $count = get_option( 'gencwooc_products_per_page' ) ? get_option( 'gencwooc_products_per_page' ) : apply_filters( 'genesiswooc_default_products_per_page', get_option( 'posts_per_page' ) );
+    $count = get_option( 'gencwooc_products_per_page' );
+    if ( ! $count ) {
+        $count = apply_filters( 'genesiswooc_default_products_per_page', get_option( 'posts_per_page' ) );
+    }
     return $count;

genesis-connect-woocommerce/trunk/lib/template-loader.php

-                      r1921233
+                      r2123371
 <?php
 /**
+ * These functions manage loading of templates for WooCommerce
+ *
+ * @package genesis_connect_woocommerce
+ * @version 0.9.8
+ *
+ * These functions manage loading of templates for WooCommerce.
+ *
+ * @package Genesis_Connect_WooCommerce
  * @since 0.9.0
  */
+/**
+ * Prevent direct access to this file
+ */
+if ( ! defined( 'ABSPATH' ) )
+    exit( _( 'Sorry, you are not allowed to access this file directly.' ) );
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 /**
  * Load the Genesis-fied templates, instead of the WooCommerce defaults.
+ *
  * Hooked to 'template_include' filter
+ *
  * This template loader determines which template file will be used for the requested page, and uses the
  * following hierarchy to find the template:
+ * Hooked to 'template_include' filter.
+ *
+ * This template loader determines which template file will be used for the requested page,
+ * and uses the following hierarchy to find the template:
  * 1. First looks in the child theme's 'woocommerce' folder.
  * 2. If no template found, falls back to GCW's templates.
+ *
+ * For taxonomy templates, first looks in child theme's 'woocommerce' folder and searches for term specific template,
+ * then taxonomy specific template, then taxonomy.php. If no template found, falls back to GCW's taxonomy.php.
+ * For taxonomy templates, first looks in child theme's 'woocommerce' folder and searches for term
+ * specific template, then taxonomy specific template, then taxonomy.php. If no template found,
+ * falls back to GCW's taxonomy.php.
+ *
  * GCW provides three templates in the plugin's 'templates' directory:
 …
  * - taxonomy.php
+ *
+ * Users can override GCW templates by placing their own templates in their child theme's 'woocommerce' folder.
+ * The 'woocommerce' folder must be a folder in the child theme's root directory, eg themes/my-child-theme/woocommerce
+ * Users can override GCW templates by placing their own templates in their child theme's
+ * 'woocommerce' folder. The 'woocommerce' folder must be a folder in the child theme's root
+ * directory, eg themes/my-child-theme/woocommerce.
+ *
  * Permitted user templates (as per WP Template Hierarchy) are:
  * - single-product.php
 …
  * - taxonomy.php
+ *
+ * Note that in the case of taxonomy templates, this function accommodates ALL taxonomies registered to the
+ * 'product' custom post type. This means that it will cater for users' own custom taxonomies as well as WooC's.
+ * Note that in the case of taxonomy templates, this function accommodates ALL taxonomies
+ * registered to the 'product' custom post type. This means that it will cater for users' own
+ * custom taxonomies as well as WooCommerce taxonomies.
+ *
  * @since 0.9.0
+ *
  * @param string $template Template file as per template hierarchy
  * @return string $template Specific GCW template if a product page (single or archive)
  * or a product taxonomy term, or returns original template
+ * @param string $template Template file as per template hierarchy.
+ *
+ * @return string $template Template file as per template hierarchy.
  */
 function gencwooc_template_loader( $template ) {
 …
+    }
+    if ( is_single() && 'product' == get_post_type() ) {
+    if ( is_single() && 'product' === get_post_type() ) {
         $template = locate_template( array( 'woocommerce/single-product.php' ) );
         if ( ! $template )
+        if ( ! $template ) {
             $template = GCW_TEMPLATE_DIR . '/single-product.php';
+    }
+    elseif ( is_post_type_archive( 'product' ) ||  is_page( wc_get_page_id( 'shop' ) ) ) {
+        }
+    } elseif ( is_post_type_archive( 'product' ) || is_page( wc_get_page_id( 'shop' ) ) ) {
         $template = locate_template( array( 'woocommerce/archive-product.php' ) );
         if ( ! $template )
+        if ( ! $template ) {
             $template = GCW_TEMPLATE_DIR . '/archive-product.php';
+    }
+    elseif ( is_tax() ) {
+        $term = get_query_var( 'term' );
+        $tax = get_query_var( 'taxonomy' );
+        /** Get an array of all relevant taxonomies */
+        }
+    } elseif ( is_tax() ) {
+        $term       = get_query_var( 'term' );
+        $tax        = get_query_var( 'taxonomy' );
         $taxonomies = get_object_taxonomies( 'product', 'names' );
+        if ( in_array( $tax, $taxonomies ) ) {
+            $tax = sanitize_title( $tax );
+        if ( in_array( $tax, $taxonomies, true ) ) {
+            $tax  = sanitize_title( $tax );
             $term = sanitize_title( $term );
             $templates = array(
                 'woocommerce/taxonomy-'.$tax.'-'.$term.'.php',
                 'woocommerce/taxonomy-'.$tax.'.php',
+                "woocommerce/taxonomy-{$tax}-{$term}.php",
+                "woocommerce/taxonomy-{$tax}.php",
                 'woocommerce/taxonomy.php',
             );
 …
             $template = locate_template( $templates );
+            /** Fallback to GCW template */
+            if ( ! $template )
+            if ( ! $template ) {
                 $template = GCW_TEMPLATE_DIR . '/taxonomy.php';
+            }
+        }
+    }
 …
+}
+/**
+ * Shop Loop 'template part' loader
+/**
+ * Shop Loop 'template part' loader.
+ *
  * ONLY RETAINED FOR BACKWARDS COMPATIBILITY for GCW pre-0.9.2 custom templates which
 …
  * loads the default WooCommerce loop-shop.php file.
+ *
+ * Note: loop-shop.php is used to display products on the archive and taxonomy pages
+ *
+ * Users can override the default WooCommerce loop-shop.php by placing their own template (named loop-shop.php) in
+ * their child theme's 'woocommerce' folder. The'woocommerce' folder must be a folder in the
+ * child theme's root directory, eg themes/my-child-theme/woocommerce.
+ * Note: loop-shop.php is used to display products on the archive and taxonomy pages.
+ *
+ * Users can override the default WooCommerce loop-shop.php by placing their own template
+ * (named loop-shop.php) in their child theme's 'woocommerce' folder. The'woocommerce' folder
+ * must be a folder in the child theme root directory, eg themes/my-child-theme/woocommerce.
+ *
  * It is recommended to use woocommerce/templates/loop-shop.php as the starting point of
  * any custom loop template.
 …
+ *
  * Note: updated v0.9.3 to reflect changes to woocommerce_get_template_part() introduced in
+ * WooC v1.4+ and, effectively, this function is a clone of woocommerce_get_template_part()
+ * WooCommerce v1.4+ and, effectively, this function is a clone of woocommerce_get_template_part()
+ *
+ * @global object $woocommerce WooCommerce instance
+ *
  * @since 0.9.0
+ * @updated 0.9.8
+ * @global object $woocommerce WooCommerce instance
+ */
+ function gencwooc_get_template_part( $slug, $name = '' ) {
+ *
+ * @param string $slug The template slug.
+ * @param string $name The template name.
+ */
+function gencwooc_get_template_part( $slug, $name = '' ) {
     global $woocommerce;
     $template = '';
+    // Look in yourtheme/slug-name.php and yourtheme/woocommerce/slug-name.php
+    if ( $name )
+        $template = locate_template( array ( "{$slug}-{$name}.php", "{$woocommerce->template_url}{$slug}-{$name}.php" ) );
+    // Get default slug-name.php
+    if ( !$template && $name && file_exists( $woocommerce->plugin_path() . "/templates/{$slug}-{$name}.php" ) )
+    if ( $name ) {
+        $template = locate_template( array( "{$slug}-{$name}.php", "{$woocommerce->template_url}{$slug}-{$name}.php" ) );
+    }
+    if ( ! $template && $name && file_exists( $woocommerce->plugin_path() . "/templates/{$slug}-{$name}.php" ) ) {
         $template = $woocommerce->plugin_path() . "/templates/{$slug}-{$name}.php";
+    // If template file doesn't exist, look in yourtheme/slug.php and yourtheme/woocommerce/slug.php
+    if ( !$template )
+        $template = locate_template( array ( "{$slug}.php", "{$woocommerce->template_url}{$slug}.php" ) );
+    if ( $template )
+    }
+    if ( ! $template ) {
+        $template = locate_template( array( "{$slug}.php", "{$woocommerce->template_url}{$slug}.php" ) );
+    }
+    if ( $template ) {
         load_template( $template, false );
+}
+/**
+ * Display shop items
+ *
+ * FOR BACKWARDS COMPATIBILITY with WooCommerce versions pre-1.6.0
+ *
+ * Uses WooCommerce structure and contains all existing WooCommerce hooks
+ * Note that this will also display any content created in the Shop Page itself
+ *
+ * Code based on WooCommerce 1.5.5 woocommerce_archive_product_content()
+    }
+}
+/**
+ * Display shop items.
+ *
+ * For backwards compatibility with WooCommerce versions pre-1.6.0.
+ *
+ * Uses WooCommerce structure and contains all existing WooCommerce hooks.
+ *
+ * Note that this will also display any content created in the Shop Page itself.
+ *
+ * Code based on WooCommerce 1.5.5 woocommerce_archive_product_content().
+ *
  * @see woocommerce/woocommerce-template.php
+ *
+ *
  * @since 0.9.4
  * @updated 0.9.6
  * @global string|int $shop_page_id The ID of the Shop WP Page
+ *
+ * @global string|int $shop_page_id The ID of the Shop WP Page.
  */
 function genesiswooc_product_archive() {
 …
     global $shop_page_id;
+    if ( !is_search() ) :
+            $shop_page = get_post( $shop_page_id );
+            $shop_page_title = apply_filters( 'the_title', ( get_option( 'woocommerce_shop_page_title' ) ) ? get_option( 'woocommerce_shop_page_title' ) : $shop_page->post_title, $shop_page->ID );
+            $shop_page_content = $shop_page->post_content;
+        else :
+            $shop_page_title = __( 'Search Results:', 'woocommerce' ) . ' &ldquo;' . get_search_query() . '&rdquo;';
+            if ( get_query_var( 'paged' ) ) $shop_page_title .= ' &mdash; ' . __( 'Page', 'woocommerce' ) . ' ' . get_query_var( 'paged' );
+            $shop_page_content = '';
+        endif;
+    if ( ! is_search() ) {
+        $shop_page         = get_post( $shop_page_id );
+        $shop_page_title   = apply_filters( 'the_title', ( get_option( 'woocommerce_shop_page_title' ) ) ? get_option( 'woocommerce_shop_page_title' ) : $shop_page->post_title, $shop_page->ID );
+        $shop_page_content = $shop_page->post_content;
+    } else {
+        $shop_page_title = __( 'Search Results:', 'gencwooc' ) . ' &ldquo;' . get_search_query() . '&rdquo;';
+        if ( get_query_var( 'paged' ) ) {
+            $shop_page_title .= ' &mdash; ' . __( 'Page', 'gencwooc' ) . ' ' . get_query_var( 'paged' );
+        }
+        $shop_page_content = '';
+    }
     do_action( 'woocommerce_before_main_content' );
+?>
+    <h1 class="page-title"><?php echo $shop_page_title ?></h1>
+    <?php echo apply_filters( 'the_content', $shop_page_content );
+    ?>
+    <h1 class="page-title"><?php echo $shop_page_title; // phpcs:ignore WordPress.Security.EscapeOutput ?></h1>
+    <?php
+    echo apply_filters( 'the_content', $shop_page_content ); // phpcs:ignore WordPress.Security.EscapeOutput
     woocommerce_get_template_part( 'loop', 'shop' );
 …
     do_action( 'woocommerce_after_main_content' );
+}
+/**
+ * Displays shop items for the queried taxonomy term
+ *
+ * FOR BACKWARDS COMPATIBILITY with WooCommerce versions pre-1.6.0
+ *
+ * Uses WooCommerce structure and contains all existing WooCommerce hooks
+ *
+ * Code based on WooCommerce 1.5.5 woocommerce_product_taxonomy_content()
+}
+/**
+ * Displays shop items for the queried taxonomy term.
+ *
+ * For backwards compatibility with WooCommerce versions pre-1.6.0.
+ *
+ * Uses WooCommerce structure and contains all existing WooCommerce hooks.
+ *
+ * Code based on WooCommerce 1.5.5 woocommerce_product_taxonomy_content().
+ *
  * @see woocommerce/woocommerce-template.php
+ *
+ *
  * @since 0.9.4
  */
 …
+}
+/**
+ * Displays shop items for archives (taxonomy and main shop page)
+ *
+ * Only loaded if WooC 1.6.0+ is in use.
+ *
+ * Uses WooCommerce structure and contains all existing WooCommerce hooks
+ *
+ * Code based on WooCommerce 2.1.12 templates/archive-product.php
+ *
+/**
+ * Displays shop items for archives (taxonomy and main shop page).
+ *
+ * Only loaded if WooCommerce 1.6.0+ is in use.
+ *
+ * Uses WooCommerce structure and contains all existing WooCommerce hooks.
+ *
+ * Code based on WooCommerce 2.1.12 templates/archive-product.php.
+ *
  * @since 0.9.4
- * @updated 0.9.8
  */
 function genesiswooc_content_product() {
     /**
      * woocommerce_before_main_content hook
+     * For woocommerce_before_main_content hook.
+     *
      * @hooked woocommerce_output_content_wrapper - 10 (outputs opening divs for the content)
 …
     if ( apply_filters( 'woocommerce_show_page_title', true ) ) {
         echo '<h1 class="woocommerce-products-header__title page-title">';
         woocommerce_page_title();
         echo '</h1>';
+    }
 …
          */
         do_action( 'woocommerce_before_shop_loop' );
         woocommerce_product_loop_start();
         if ( wc_get_loop_prop( 'total' ) ) {
             while ( have_posts() ) {
                 the_post();
                 /**
                  * Hook: woocommerce_shop_loop.
 …
                  */
                 do_action( 'woocommerce_shop_loop' );
                 wc_get_template_part( 'content', 'product' );
+            }
+        }
         woocommerce_product_loop_end();
         /**
          * Hook: woocommerce_after_shop_loop.
 …
         do_action( 'woocommerce_no_products_found' );
+    }
     /**
      * Hook: woocommerce_after_main_content.

genesis-connect-woocommerce/trunk/readme.txt

-                      r1921233
+                      r2123371
 Tags: genesis, genesiswp, studiopress, woocommerce
 Requires at least: 3.3
 Tested up to: 4.9
 Stable tag: 1.0
+Tested up to: 5.2.2
+Stable tag: 1.1.0
 This plugin allows you to seamlessly integrate WooCommerce with the Genesis Framework and Genesis child themes.
 …
 == Changelog ==
+= 1.1.0 =
+* Added php codesniffer via composer package for WordPress code standards.
+* Fixed spacing and syntax issues for WordPress code standards.
+* Renamed Gencwooc_Featured_Products file to adhere to WordPress code standards.
 = 1.0 =
 …
 = 0.9.8 =
 * Released 9 July 2014
 * Updates genesiswooc_content_product() to reflect WooC 2.1+ templates and correct handling of WooC's page title filter function
+* Updates genesiswooc_content_product() to reflect WooCommerce 2.1+ templates and correct handling of WooCommerce page title filter function
 = 0.9.7 =
 …
 = 0.9.2 =
 * Released 15 March 2012
 * single-product.php - Single product title template file now hooked in as per WooC 1.5.2
+* single-product.php - Single product title template file now hooked in as per WooCommerce 1.5.2
 = 0.9.1 =

genesis-connect-woocommerce/trunk/sp-plugins-integration/genesis-simple-menus.php

-                      r1812865
+                      r2123371
 <?php
 /**
  * Integration - Genesis Simple Menus
+ * Genesis Simple Menus integration.
+ *
+ * @package genesis_connect_woocommerce
+ * @version 0.9.8
+ *
+ * @package Genesis_Connect_WooCommerce
  * @since 0.9.0
+ *
 …
+ *
  * What GCW integration needs to do:
  *  1. add_post_type_support for 'genesis-simple-menus'
  *  2. deal with serving correct GSM menu for Shop page (product archive)
+ *  1. add_post_type_support for 'genesis-simple-menus'
+ *  2. deal with serving correct GSM menu for Shop page (product archive)
+ *
  * What GCW does:
  *  1. GCW adds post_type_support for GSM - see gencwooc_setup()
  *  2. uses Genesis filters to intercept request and serve correct GSM menu on Shop Page
+ *  1. GCW adds post_type_support for GSM - see gencwooc_setup()
+ *  2. uses Genesis filters to intercept request and serve correct GSM menu on Shop Page
+ *
  * Note: this file is loaded on the 'after_theme_setup' hook only if GSM
  * is activated.
  * @see gencwooc_setup() in genesis-connect-woocommerce.php
+ *
  */
+/**
+ * Prevent direct access to this file
+ */
+if ( ! defined( 'ABSPATH' ) )
+    exit( __( 'Sorry, you are not allowed to access this file directly.', 'genwooc' ) );
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 add_filter( 'genesis_pre_get_option_subnav_type', 'gencwooc_gsm_subnav_type', 9 );
 /**
  * Tells Genesis to load a custom menu
+ * Tells Genesis to load a custom menu.
+ *
  * @since 0.9.0
+ *
  * @see Genesis_Simple_Menus::wp_head()
+ * @param str $nav
+ * @return str 'nav-menu' which tells Genesis to get a custom menu
+ *
+ * @param string $nav The sub nav type.
+ *
+ * @return string The sub nav type.
  */
 function gencwooc_gsm_subnav_type( $nav ) {
 …
 add_filter( 'theme_mod_nav_menu_locations', 'gencwooc_gsm_theme_mod' );
 /**
  * Replace the menu selected in the WordPress Menu settings with the custom one for this request
+ * Replace the menu selected in the WordPress Menu settings with the custom one for this request.
+ *
  * @since 0.9.0
+ *
  * @see Genesis_Simple_Menus::wp_head()
+ * @param array $mods Array of theme mods
+ * @return array $mods Modified array of theme mods
+ *
+ * @param array $mods Array of theme mods.
+ *
+ * @return array $mods Array of theme mods.
  */
 function gencwooc_gsm_theme_mod( $mods ) {
     /** Post meta key as per GSM 0.1.4 */
     $field_name = '_gsm_menu';
+    $shop_id = function_exists( 'wc_get_page_id' ) ? wc_get_page_id( 'shop' ) : woocommerce_get_page_id( 'shop' );
+    $_menu   = get_post_meta( $shop_id, '_gsm_menu', true );
+    $shop_id = function_exists( 'wc_get_page_id' ) ? wc_get_page_id( 'shop' ) : woocommerce_get_page_id( 'shop' );
+    if ( is_post_type_archive( 'product' ) && $_menu = get_post_meta( $shop_id, $field_name, true ) )
+    if ( is_post_type_archive( 'product' ) && $_menu ) {
         $mods['secondary'] = (int) $_menu;
+    }
     return $mods;

genesis-connect-woocommerce/trunk/sp-plugins-integration/genesis-simple-sidebars.php

-                      r1921233
+                      r2123371
 <?php
 /**
  * Integration - Genesis Simple Sidebars
+ * Genesis Simple Sidebars integration.
+ *
+ * @package genesis_connect_woocommerce
+ * @version 0.9.8
+ *
+ * @package Genesis_Connect_WooCommerce
  * @since 0.9.0
+ *
  * Based on Genesis Simple Sidebars (GSS) version 0.9.2
+ * Based on Genesis Simple Sidebars (GSS) version 0.9.2.
+ *
  * What GCW integration needs to do:
  *  1. add_post_type_support for 'genesis-simple-sidebars'
  *  2. deal with serving correct GSS sidebar(s) for Shop page (product archive)
+ *  1. Add_post_type_support for 'genesis-simple-sidebars'.
+ *  2. Deal with serving correct GSS sidebar(s) for Shop page (product archive).
+ *
  * What GCW does:
  *  1. GCW adds post_type_support for GSS - see gencwooc_setup()
  *  2. intercepts GSS sidebar loading functions, deals with Shop Page,
  * then hands back control of sidebar loading in all other cases to GSS
+ *  1. GCW adds post_type_support for GSS - see gencwooc_setup().
+ *  2. Intercepts GSS sidebar loading functions, deals with Shop Page,
+ * then hands back control of sidebar loading in all other cases to GSS.
+ *
+ * Note: this file is loaded on the 'after_theme_setup' hook only if GSS
+ * is activated.
+ * Note: this file is loaded on the 'after_theme_setup' hook only if GSS is activated.
  * @see gencwooc_setup() in genesis-connect-woocommerce.php
+ *
- * @TODO simply these functions
  */
+/**
+ * Prevent direct access to this file
+ */
+if ( ! defined( 'ABSPATH' ) )
+    exit( __( 'Sorry, you are not allowed to access this file directly.', 'genwooc' ) );
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 add_action( 'get_header', 'gencwooc_ss_handler', 11 );
 /**
  * Take control of GSS sidebar loading
+ * Take control of GSS sidebar loading.
+ *
+ * Hooked to 'get_header' with priority of 11 to ensure that GSS's
+ * actions, which are unhooked here in this function, have been added
+ * and therefore can be removed.
+ * Hooked to 'get_header' with priority of 11 to ensure that GSS's actions, which are unhooked
+ * here in this function, have been added and therefore can be removed.
+ *
+ * Unhooks GSS ss_do_sidebar() and ss_do_sidebar_alt() functions and
+ * hooks GCW versions of these functions to the same hooks instead.
+ * Unhooks GSS ss_do_sidebar() and ss_do_sidebar_alt() functions and hooks GCW versions of
+ * these functions to the same hooks instead.
+ *
  * @see GSS ss_sidebars_init() in genesis-simple-sidebars/plugin.php
+ *
  * Note for developers:
  * ====================
  * If you want to do more complex manipulations of sidebars, eg load another one
  * altogether (ie not a GSS sidebar, G Sidebar or G Sidebar Alt), unhook this
  * function and replace it with your own version.
+ * If you want to do more complex manipulations of sidebars, eg load another one altogether
+ * (ie not a GSS sidebar, G Sidebar or G Sidebar Alt), unhook this function and replace it with
+ * your own version.
+ *
  * @since 0.9.0
+ *
  */
 function gencwooc_ss_handler() {
-    /** Unhook GSS functions */
     remove_action( 'genesis_sidebar', 'ss_do_sidebar' );
     remove_action( 'genesis_sidebar_alt', 'ss_do_sidebar_alt' );
-    /** Hook replacement functions */
     add_action( 'genesis_sidebar', 'gencwooc_ss_do_sidebar' );
     add_action( 'genesis_sidebar_alt', 'gencwooc_ss_do_sidebar_alt' );
 …
 /**
  * Callback for dealing with Primary Sidebar loading
+ * Callback for dealing with Primary Sidebar loading.
+ *
  * Intercepts GSS code flow, so that Shop page can be dealt with, then
  * hands back control to the GSS function for loading primary sidebars.
  * Effectively, it's just a more complex version of ss_do_sidebar()
+ * Intercepts GSS code flow, so that Shop page can be dealt with, then hands back control to the
+ * GSS function for loading primary sidebars. Effectively, it's just a more complex version
+ * of ss_do_sidebar().
+ *
+ * Checks if we're on the product archive and a GSS sidebar has been
+ * assigned in the Shop WP Page editor, then, if both true, loads the relevant
+ * GSS sidebar on the Shop Page.
+ * Checks if we're on the product archive and a GSS sidebar has been assigned in the
+ * Shop WP Page editor, then, if both true, loads the relevant GSS sidebar on the Shop Page.
+ *
  * If either of the above conditions return false, we load the regular sidebar.
 …
+ *
  * @uses woocommerce_get_page_id()
+ *
  */
 function gencwooc_ss_do_sidebar() {
-    $bar = '_ss_sidebar';
     $shop_id = function_exists( 'wc_get_page_id' ) ? wc_get_page_id( 'shop' ) : woocommerce_get_page_id( 'shop' );
+    $_bar    = get_post_meta( $shop_id, '_ss_sidebar', true );
+    if ( is_post_type_archive( 'product' ) && $_bar = get_post_meta( $shop_id, $bar, true ) ) {
+    if ( is_post_type_archive( 'product' ) && $_bar ) {
         dynamic_sidebar( $_bar );
     } else {
         genesis_do_sidebar();
+    }
 …
 /**
  * Callback for dealing with Sidebar Alt loading
+ * Callback for dealing with Sidebar Alt loading.
+ *
  * Intercepts GSS code flow, so that Shop page can be dealt with, then
  * hands back control to the GSS function for loading secondary sidebars.
  * Effectively, it's just a more complex version of ss_do_sidebar_alt()
+ * Intercepts GSS code flow, so that Shop page can be dealt with, then hands back control to the
+ * GSS function for loading secondary sidebars. Effectively, it's just a more complex version
+ * of ss_do_sidebar_alt().
+ *
+ * Checks if we're on the product archive and a GSS sidebar has been
+ * assigned in the Shop WP Page editor, then, if both true, loads the relevant
+ * GSS sidebar on the Shop Page.
+ * Checks if we're on the product archive and a GSS sidebar has been assigned in the
+ * Shop WP Page editor, then, if both true, loads the relevant GSS sidebar on the Shop Page.
+ *
  * If either of the above conditions return false, we load the regular alt sidebar.
 …
+ *
  * @uses woocommerce_get_page_id()
+ *
  */
 function gencwooc_ss_do_sidebar_alt() {
-    $bar = '_ss_sidebar_alt';
     $shop_id = function_exists( 'wc_get_page_id' ) ? wc_get_page_id( 'shop' ) : woocommerce_get_page_id( 'shop' );
+    $_bar    = get_post_meta( $shop_id, '_ss_sidebar_alt', true );
+    if ( is_post_type_archive( 'product' ) && $_bar = get_post_meta( $shop_id, $bar, true ) ) {
+    if ( is_post_type_archive( 'product' ) && $_bar ) {
         dynamic_sidebar( $_bar );
     } else {
         genesis_do_sidebar_alt();
+    }

genesis-connect-woocommerce/trunk/templates/archive-product.php

-                      r1921233
+                      r2123371
 <?php
 /**
  * This template displays the archive for Products
+ * This template displays the archive for Products.
+ *
  * @package genesis_connect_woocommerce
+ * @package Genesis_Connect_WooCommerce
  * @version 0.9.8
+ * @since 0.9.0
+ *
  * Note for customisers/users: Do not edit this file!
 …
  * The version in the child theme's woocommerce folder will override this template, and
  * any future updates to this plugin won't wipe out your customisations.
+ *
- * @since 0.9.0
+ *
  */
+/** Remove default Genesis loop */
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 remove_action( 'genesis_loop', 'genesis_do_loop' );
-/** Remove Genesis archive title/description */
 remove_action( 'genesis_before_loop', 'genesis_do_taxonomy_title_description', 15 );
-/** Remove WooCommerce breadcrumbs */
 remove_action( 'woocommerce_before_main_content', 'woocommerce_breadcrumb', 20 );
-/** Uncomment the below line of code to add back WooCommerce breadcrumbs */
-//add_action( 'genesis_before_loop', 'woocommerce_breadcrumb', 10, 0 );
-/** Remove Woo #container and #content divs */
 remove_action( 'woocommerce_before_main_content', 'woocommerce_output_content_wrapper', 10 );
 remove_action( 'woocommerce_after_main_content', 'woocommerce_output_content_wrapper_end', 10 );
 …
  * @since 0.9.0
+ *
+ * @param str $layout Current Genesis page layout, such as 'content-sidebar'.
+ * @return str Page layout if set for the shop page, otherwise the default site layout.
+ * @param string $layout Current Genesis page layout, such as 'content-sidebar'.
+ *
+ * @return string Page layout if set for the shop page, otherwise the default site layout.
  */
 function genesiswooc_archive_layout( $layout ) {
 …
  * Display shop items (product custom post archive)
+ *
+ * This function has been refactored in 0.9.4 to provide compatibility with
+ * both WooC 1.6.0 and backwards compatibility with older versions.
+ * This is needed thanks to substantial changes to WooC template contents
+ * introduced in WooC 1.6.0.
+ * This function has been refactored in 0.9.4 to provide compatibility with both WooCommerce 1.6.0
+ * and backwards compatibility with older versions.
+ *
+ * @uses genesiswooc_content_product() if WooC is version 1.6.0+
+ * @uses genesiswooc_product_archive() for earlier WooC versions
+ * This is needed thanks to substantial changes to WooCommerce template contents introduced in
+ * WooCommerce 1.6.0.
+ *
+ * @uses genesiswooc_content_product() if WooCommerce is version 1.6.0+
+ * @uses genesiswooc_product_archive() for earlier WooCommerce versions
+ *
  * @since 0.9.0
  * @updated 0.9.4
  * @global object $woocommerce
+ *
+ * @global WooCommerce $woocommerce Current WooCommerce instance.
  */
 function genesiswooc_archive_product_loop() {
 …
     $new = version_compare( $woocommerce->version, '1.6.0', '>=' );
     if ( $new )
+    if ( $new ) {
         genesiswooc_content_product();
+    } else {
+        genesiswooc_product_archive();
+    }
-    else
-        genesiswooc_product_archive();
+}

genesis-connect-woocommerce/trunk/templates/single-product.php

-                      r1921233
+                      r2123371
 <?php
 /**
  * This template displays the single Product
+ * This template displays the single Product.
+ *
  * @package genesis_connect_woocommerce
+ * @package Genesis_Connect_WooCommerce
  * @version 0.9.8
+ * @since 0.9.0
+ *
  * Note for customisers/users: Do not edit this file!
 …
  * The version in the child theme's woocommerce folder will override this template, and
  * any future updates to this plugin won't wipe out your customisations.
+ *
  */
+/** Remove default Genesis loop */
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 remove_action( 'genesis_loop', 'genesis_do_loop' );
-/** Remove WooCommerce breadcrumbs */
 remove_action( 'woocommerce_before_main_content', 'woocommerce_breadcrumb', 20 );
-/** Uncomment the below line of code to add back WooCommerce breadcrumbs */
-//add_action( 'genesis_before_loop', 'woocommerce_breadcrumb', 10, 0 );
-/** Remove Woo #container and #content divs */
 remove_action( 'woocommerce_before_main_content', 'woocommerce_output_content_wrapper', 10 );
 remove_action( 'woocommerce_after_main_content', 'woocommerce_output_content_wrapper_end', 10 );
 add_action( 'genesis_loop', 'gencwooc_single_product_loop' );
 /**
  * Displays single product loop
+ * Displays single product loop.
+ *
  * Uses WooCommerce structure and contains all existing WooCommerce hooks
+ * Uses WooCommerce structure and contains all existing WooCommerce hooks.
+ *
+ * Code based on WooCommerce 1.5.5 woocommerce_single_product_content()
+ * Code based on WooCommerce 1.5.5 woocommerce_single_product_content().
+ *
  * @see woocommerce/woocommerce-template.php
+ *
 …
     do_action( 'woocommerce_before_main_content' );
+    // Let developers override the query used, in case they want to use this function for their own loop/wp_query
+    $wc_query = false;
+    $wc_query = apply_filters( 'gencwooc_custom_query', false );
+    // Added a hook for developers in case they need to modify the query
+    $wc_query = apply_filters( 'gencwooc_custom_query', $wc_query );
+    if ( ! $wc_query) {
+    if ( ! $wc_query ) {
         global $wp_query;
 …
+    }
+    if ( $wc_query->have_posts() ) while ( $wc_query->have_posts() ) : $wc_query->the_post(); ?>
+    if ( $wc_query->have_posts() ) {
+        while ( $wc_query->have_posts() ) {
+            $wc_query->the_post();
+        <?php do_action('woocommerce_before_single_product'); ?>
+            do_action( 'woocommerce_before_single_product' );
+            ?>
+        <div id="product-<?php the_ID(); ?>" <?php post_class(); ?>>
+            <div id="product-<?php the_ID(); ?>" <?php post_class(); ?>>
+                <?php do_action( 'woocommerce_before_single_product_summary' ); ?>
+            <?php do_action( 'woocommerce_before_single_product_summary' ); ?>
+                <div class="summary">
+                    <?php do_action( 'woocommerce_single_product_summary' ); ?>
+                </div>
+            <div class="summary">
+                <?php do_action( 'woocommerce_single_product_summary'); ?>
+                <?php do_action( 'woocommerce_after_single_product_summary' ); ?>
             </div>
+            <?php do_action( 'woocommerce_after_single_product_summary' ); ?>
+        </div>
+        <?php do_action( 'woocommerce_after_single_product' );
+    endwhile;
+            <?php
+            do_action( 'woocommerce_after_single_product' );
+        }
+    }
     do_action( 'woocommerce_after_main_content' );
+}

genesis-connect-woocommerce/trunk/templates/taxonomy.php

-                      r1921233
+                      r2123371
 <?php
 /**
  * This template displays the Product Category and Tag taxonomy term archives
+ * This template displays the Product Category and Tag taxonomy term archives.
+ *
  * @package genesis_connect_woocommerce
+ * @package Genesis_Connect_WooCommerce
  * @version 0.9.8
+ * @since 0.9.0
+ *
  * Note for customisers/users: Do not edit this file!
 …
  * The version in the child theme's woocommerce folder will override this template, and
  * any future updates to this plugin won't wipe out your customisations.
+ *
  */
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
-/** Remove default Genesis loop */
 remove_action( 'genesis_loop', 'genesis_do_loop' );
+remove_action( 'woocommerce_archive_description', 'woocommerce_taxonomy_archive_description' );
+remove_action( 'woocommerce_before_main_content', 'woocommerce_breadcrumb', 20 );
+remove_action( 'woocommerce_before_main_content', 'woocommerce_output_content_wrapper', 10 );
+remove_action( 'woocommerce_after_main_content', 'woocommerce_output_content_wrapper_end', 10 );
-// Remove the WooCommerce archive title and description.
 add_filter( 'woocommerce_show_page_title', '__return_false' );
-remove_action( 'woocommerce_archive_description', 'woocommerce_taxonomy_archive_description' );
 add_filter( 'genesis_term_intro_text_output', 'genesiswooc_term_intro_text_output' );
 …
  * Fall back to the archive description if no intro text is set.
+ *
+ * @since 1.0.0
+ *
  * @param string $intro_text The default Genesis archive intro text.
+ *
  * @return string Archive intro text, or archive description if no intro text set.
+ *
- * @since 1.0
  */
 function genesiswooc_term_intro_text_output( $intro_text ) {
     $wp_archive_description = get_the_archive_description();
 …
     return $intro_text;
+}
-/** Remove WooCommerce breadcrumbs */
-remove_action( 'woocommerce_before_main_content', 'woocommerce_breadcrumb', 20 );
-/** Uncomment the below line of code to add back WooCommerce breadcrumbs */
-//add_action( 'genesis_before_loop', 'woocommerce_breadcrumb', 10, 0 );
-/** Remove Woo #container and #content divs */
-remove_action( 'woocommerce_before_main_content', 'woocommerce_output_content_wrapper', 10 );
-remove_action( 'woocommerce_after_main_content', 'woocommerce_output_content_wrapper_end', 10 );
 add_action( 'genesis_loop', 'genesiswooc_product_taxonomy_loop' );
 /**
  * Displays shop items for the queried taxonomy term
+ * Displays shop items for the queried taxonomy term.
+ *
  * This function has been refactored in 0.9.4 to provide compatibility with
  * both WooC 1.6.0 and backwards compatibility with older versions.
  * This is needed thanks to substantial changes to WooC template contents
  * introduced in WooC 1.6.0.
+ * both WooCommerce 1.6.0 and backwards compatibility with older versions.
+ * This is needed thanks to substantial changes to WooCommerce template contents
+ * introduced in WooCommerce 1.6.0.
+ *
+ * @uses genesiswooc_content_product() if WooC is version 1.6.0+
+ * @uses genesiswooc_product_taxonomy() for earlier WooC versions
+ * @global $woocommerce $woocommerce The WooCommerce instance.
+ *
+ * @uses genesiswooc_content_product() if WooCommerce is version 1.6.0+
+ * @uses genesiswooc_product_taxonomy() for earlier WooCommerce versions
+ *
  * @since 0.9.0
- * @updated 0.9.4
  */
 function genesiswooc_product_taxonomy_loop() {
 …
     $new = version_compare( $woocommerce->version, '1.6.0', '>=' );
     if ( $new )
+    if ( $new ) {
         genesiswooc_content_product();
+    else
+    } else {
         genesiswooc_product_taxonomy();
+    }
+}

Plugin Directory

Context Navigation

Legend:

genesis-connect-woocommerce/tags/1.1.0

genesis-connect-woocommerce/tags/1.1.0/admin/notices.php

genesis-connect-woocommerce/tags/1.1.0/admin/views/html-notice-needs-genesis.php

genesis-connect-woocommerce/tags/1.1.0/admin/views/html-notice-needs-woocommerce.php

genesis-connect-woocommerce/tags/1.1.0/genesis-connect-woocommerce.php

genesis-connect-woocommerce/tags/1.1.0/lib/breadcrumb.php

genesis-connect-woocommerce/tags/1.1.0/lib/posts-per-page.php

genesis-connect-woocommerce/tags/1.1.0/lib/template-loader.php

genesis-connect-woocommerce/tags/1.1.0/readme.txt

genesis-connect-woocommerce/tags/1.1.0/sp-plugins-integration/genesis-simple-menus.php

genesis-connect-woocommerce/tags/1.1.0/sp-plugins-integration/genesis-simple-sidebars.php

genesis-connect-woocommerce/tags/1.1.0/templates/archive-product.php

genesis-connect-woocommerce/tags/1.1.0/templates/single-product.php

genesis-connect-woocommerce/tags/1.1.0/templates/taxonomy.php

genesis-connect-woocommerce/trunk

genesis-connect-woocommerce/trunk/admin/notices.php

genesis-connect-woocommerce/trunk/admin/views/html-notice-needs-genesis.php

genesis-connect-woocommerce/trunk/admin/views/html-notice-needs-woocommerce.php

genesis-connect-woocommerce/trunk/genesis-connect-woocommerce.php

genesis-connect-woocommerce/trunk/lib/breadcrumb.php

genesis-connect-woocommerce/trunk/lib/posts-per-page.php

genesis-connect-woocommerce/trunk/lib/template-loader.php

genesis-connect-woocommerce/trunk/readme.txt

genesis-connect-woocommerce/trunk/sp-plugins-integration/genesis-simple-menus.php

genesis-connect-woocommerce/trunk/sp-plugins-integration/genesis-simple-sidebars.php

genesis-connect-woocommerce/trunk/templates/archive-product.php

genesis-connect-woocommerce/trunk/templates/single-product.php

genesis-connect-woocommerce/trunk/templates/taxonomy.php

Download in other formats: