logged in to post a comment.', 'foundationpress' ), + printf( + __( 'You must be logged in to post a comment.', 'foundationpress' ), wp_login_url( get_permalink() ) ); ?> @@ -95,8 +94,8 @@
%2$s.', 'foundationpress' ), + printf( + __( 'Logged in as %2$s.', 'foundationpress' ), get_option( 'siteurl' ), $user_identity ); @@ -106,7 +105,10 @@
> @@ -114,7 +116,10 @@
> @@ -138,7 +143,7 @@
XHTML:
diff --git a/header.php b/header.php
index a0765eb14..35e687cba 100644
--- a/header.php
+++ b/header.php
@@ -24,7 +24,7 @@
>
+ >
diff --git a/library/class-foundationpress-comments.php b/library/class-foundationpress-comments.php
index 12be7f62f..a50d491a1 100644
--- a/library/class-foundationpress-comments.php
+++ b/library/class-foundationpress-comments.php
@@ -6,74 +6,74 @@
*/
if ( ! class_exists( 'Foundationpress_Comments' ) ) :
-class Foundationpress_Comments extends Walker_Comment {
+ class Foundationpress_Comments extends Walker_Comment {
- // Init classwide variables.
- public $tree_type = 'comment';
+ // Init classwide variables.
+ public $tree_type = 'comment';
- // Comment ID
- public $db_fields = array(
- 'parent' => 'comment_parent',
- 'id' => 'comment_ID',
- );
+ // Comment ID
+ public $db_fields = array(
+ 'parent' => 'comment_parent',
+ 'id' => 'comment_ID',
+ );
- /** CONSTRUCTOR
+ /** CONSTRUCTOR
* You'll have to use this if you plan to get to the top of the comments list, as
* start_lvl() only goes as high as 1 deep nested comments */
- function __construct() { ?>
+ function __construct() { ?>
- “”
- \n";
}
}
diff --git a/library/cleanup.php b/library/cleanup.php
index 73afcc257..ad5a603e1 100644
--- a/library/cleanup.php
+++ b/library/cleanup.php
@@ -7,25 +7,25 @@
*/
if ( ! function_exists( 'foundationpress_start_cleanup' ) ) :
-function foundationpress_start_cleanup() {
+ function foundationpress_start_cleanup() {
- // Launching operation cleanup.
- add_action( 'init', 'foundationpress_cleanup_head' );
+ // Launching operation cleanup.
+ add_action( 'init', 'foundationpress_cleanup_head' );
- // Remove WP version from RSS.
- add_filter( 'the_generator', 'foundationpress_remove_rss_version' );
+ // Remove WP version from RSS.
+ add_filter( 'the_generator', 'foundationpress_remove_rss_version' );
- // Remove pesky injected css for recent comments widget.
- add_filter( 'wp_head', 'foundationpress_remove_wp_widget_recent_comments_style', 1 );
+ // Remove pesky injected css for recent comments widget.
+ add_filter( 'wp_head', 'foundationpress_remove_wp_widget_recent_comments_style', 1 );
- // Clean up comment styles in the head.
- add_action( 'wp_head', 'foundationpress_remove_recent_comments_style', 1 );
+ // Clean up comment styles in the head.
+ add_action( 'wp_head', 'foundationpress_remove_recent_comments_style', 1 );
- // Remove inline width attribute from figure tag
- add_filter( 'img_caption_shortcode', 'foundationpress_remove_figure_inline_style', 10, 3 );
+ // Remove inline width attribute from figure tag
+ add_filter( 'img_caption_shortcode', 'foundationpress_remove_figure_inline_style', 10, 3 );
-}
-add_action( 'after_setup_theme','foundationpress_start_cleanup' );
+ }
+ add_action( 'after_setup_theme', 'foundationpress_start_cleanup' );
endif;
/**
* Clean up head.+
@@ -33,99 +33,103 @@ function foundationpress_start_cleanup() {
*/
if ( ! function_exists( 'foundationpress_cleanup_head' ) ) :
-function foundationpress_cleanup_head() {
+ function foundationpress_cleanup_head() {
- // EditURI link.
- remove_action( 'wp_head', 'rsd_link' );
+ // EditURI link.
+ remove_action( 'wp_head', 'rsd_link' );
- // Category feed links.
- remove_action( 'wp_head', 'feed_links_extra', 3 );
+ // Category feed links.
+ remove_action( 'wp_head', 'feed_links_extra', 3 );
- // Post and comment feed links.
- remove_action( 'wp_head', 'feed_links', 2 );
+ // Post and comment feed links.
+ remove_action( 'wp_head', 'feed_links', 2 );
- // Windows Live Writer.
- remove_action( 'wp_head', 'wlwmanifest_link' );
+ // Windows Live Writer.
+ remove_action( 'wp_head', 'wlwmanifest_link' );
- // Index link.
- remove_action( 'wp_head', 'index_rel_link' );
+ // Index link.
+ remove_action( 'wp_head', 'index_rel_link' );
- // Previous link.
- remove_action( 'wp_head', 'parent_post_rel_link', 10 );
+ // Previous link.
+ remove_action( 'wp_head', 'parent_post_rel_link', 10 );
- // Start link.
- remove_action( 'wp_head', 'start_post_rel_link', 10 );
+ // Start link.
+ remove_action( 'wp_head', 'start_post_rel_link', 10 );
- // Canonical.
- remove_action( 'wp_head', 'rel_canonical', 10 );
+ // Canonical.
+ remove_action( 'wp_head', 'rel_canonical', 10 );
- // Shortlink.
- remove_action( 'wp_head', 'wp_shortlink_wp_head', 10 );
+ // Shortlink.
+ remove_action( 'wp_head', 'wp_shortlink_wp_head', 10 );
- // Links for adjacent posts.
- remove_action( 'wp_head', 'adjacent_posts_rel_link_wp_head', 10 );
+ // Links for adjacent posts.
+ remove_action( 'wp_head', 'adjacent_posts_rel_link_wp_head', 10 );
- // WP version.
- remove_action( 'wp_head', 'wp_generator' );
+ // WP version.
+ remove_action( 'wp_head', 'wp_generator' );
- // Emoji detection script.
- remove_action( 'wp_head', 'print_emoji_detection_script', 7 );
+ // Emoji detection script.
+ remove_action( 'wp_head', 'print_emoji_detection_script', 7 );
- // Emoji styles.
- remove_action( 'wp_print_styles', 'print_emoji_styles' );
-}
+ // Emoji styles.
+ remove_action( 'wp_print_styles', 'print_emoji_styles' );
+ }
endif;
// Remove WP version from RSS.
if ( ! function_exists( 'foundationpress_remove_rss_version' ) ) :
-function foundationpress_remove_rss_version() { return ''; }
+ function foundationpress_remove_rss_version() {
+ return '';
+ }
endif;
// Remove injected CSS for recent comments widget.
if ( ! function_exists( 'foundationpress_remove_wp_widget_recent_comments_style' ) ) :
-function foundationpress_remove_wp_widget_recent_comments_style() {
- if ( has_filter( 'wp_head', 'wp_widget_recent_comments_style' ) ) {
- remove_filter( 'wp_head', 'wp_widget_recent_comments_style' );
+ function foundationpress_remove_wp_widget_recent_comments_style() {
+ if ( has_filter( 'wp_head', 'wp_widget_recent_comments_style' ) ) {
+ remove_filter( 'wp_head', 'wp_widget_recent_comments_style' );
+ }
}
-}
endif;
// Remove injected CSS from recent comments widget.
if ( ! function_exists( 'foundationpress_remove_recent_comments_style' ) ) :
-function foundationpress_remove_recent_comments_style() {
- global $wp_widget_factory;
- if ( isset($wp_widget_factory->widgets['WP_Widget_Recent_Comments']) ) {
- remove_action( 'wp_head', array($wp_widget_factory->widgets['WP_Widget_Recent_Comments'], 'recent_comments_style') );
+ function foundationpress_remove_recent_comments_style() {
+ global $wp_widget_factory;
+ if ( isset( $wp_widget_factory->widgets['WP_Widget_Recent_Comments'] ) ) {
+ remove_action( 'wp_head', array( $wp_widget_factory->widgets['WP_Widget_Recent_Comments'], 'recent_comments_style' ) );
+ }
}
-}
endif;
// Remove inline width attribute from figure tag causing images wider than 100% of its container
if ( ! function_exists( 'foundationpress_remove_figure_inline_style' ) ) :
-function foundationpress_remove_figure_inline_style( $output, $attr, $content ) {
- $atts = shortcode_atts( array(
- 'id' => '',
- 'align' => 'alignnone',
- 'width' => '',
- 'caption' => '',
- 'class' => '',
- ), $attr, 'caption' );
-
- $atts['width'] = (int) $atts['width'];
- if ( $atts['width'] < 1 || empty( $atts['caption'] ) ) {
- return $content;
- }
+ function foundationpress_remove_figure_inline_style( $output, $attr, $content ) {
+ $atts = shortcode_atts(
+ array(
+ 'id' => '',
+ 'align' => 'alignnone',
+ 'width' => '',
+ 'caption' => '',
+ 'class' => '',
+ ), $attr, 'caption'
+ );
+
+ $atts['width'] = (int) $atts['width'];
+ if ( $atts['width'] < 1 || empty( $atts['caption'] ) ) {
+ return $content;
+ }
+
+ if ( ! empty( $atts['id'] ) ) {
+ $atts['id'] = 'id="' . esc_attr( $atts['id'] ) . '" ';
+ }
+
+ $class = trim( 'wp-caption ' . $atts['align'] . ' ' . $atts['class'] );
+
+ if ( current_theme_supports( 'html5', 'caption' ) ) {
+ return '
", "
", $paginate_links );
- $paginate_links = str_replace( '
", "
", $paginate_links );
+ $paginate_links = str_replace( '
';
- /* translators: %1$s: link to menus, %2$s: link to customize. */
- printf( __( 'Please assign a menu to the primary menu location under %1$s or %2$s the design.', 'foundationpress' ),
- /* translators: %s: menu url */
- sprintf( __( 'Menus', 'foundationpress' ),
- get_admin_url( get_current_blog_id(), 'nav-menus.php' )
- ),
- /* translators: %s: customize url */
- sprintf( __( 'Customize', 'foundationpress' ),
- get_admin_url( get_current_blog_id(), 'customize.php' )
- )
- );
- echo '';
-}
+ function foundationpress_menu_fallback() {
+ echo '';
+ /* translators: %1$s: link to menus, %2$s: link to customize. */
+ printf(
+ __( 'Please assign a menu to the primary menu location under %1$s or %2$s the design.', 'foundationpress' ),
+ /* translators: %s: menu url */
+ sprintf(
+ __( 'Menus', 'foundationpress' ),
+ get_admin_url( get_current_blog_id(), 'nav-menus.php' )
+ ),
+ /* translators: %s: customize url */
+ sprintf(
+ __( 'Customize', 'foundationpress' ),
+ get_admin_url( get_current_blog_id(), 'customize.php' )
+ )
+ );
+ echo '';
+ }
endif;
// Add Foundation 'is-active' class for the current menu item.
if ( ! function_exists( 'foundationpress_active_nav_class' ) ) :
-function foundationpress_active_nav_class( $classes, $item ) {
- if ( $item->current == 1 || $item->current_item_ancestor == true ) {
- $classes[] = 'is-active';
+ function foundationpress_active_nav_class( $classes, $item ) {
+ if ( $item->current == 1 || $item->current_item_ancestor == true ) {
+ $classes[] = 'is-active';
+ }
+ return $classes;
}
- return $classes;
-}
-add_filter( 'nav_menu_css_class', 'foundationpress_active_nav_class', 10, 2 );
+ add_filter( 'nav_menu_css_class', 'foundationpress_active_nav_class', 10, 2 );
endif;
/**
@@ -78,16 +83,16 @@ function foundationpress_active_nav_class( $classes, $item ) {
* From required+ Foundation http://themes.required.ch.
*/
if ( ! function_exists( 'foundationpress_active_list_pages_class' ) ) :
-function foundationpress_active_list_pages_class( $input ) {
+ function foundationpress_active_list_pages_class( $input ) {
- $pattern = '/current_page_item/';
- $replace = 'current_page_item is-active';
+ $pattern = '/current_page_item/';
+ $replace = 'current_page_item is-active';
- $output = preg_replace( $pattern, $replace, $input );
+ $output = preg_replace( $pattern, $replace, $input );
- return $output;
-}
-add_filter( 'wp_list_pages', 'foundationpress_active_list_pages_class', 10, 2 );
+ return $output;
+ }
+ add_filter( 'wp_list_pages', 'foundationpress_active_list_pages_class', 10, 2 );
endif;
/**
@@ -95,65 +100,65 @@ function foundationpress_active_list_pages_class( $input ) {
*/
if ( ! function_exists( 'foundationpress_responsive_video_oembed_html' ) ) :
-function foundationpress_responsive_video_oembed_html( $html, $url, $attr, $post_id ) {
-
- // Whitelist of oEmbed compatible sites that **ONLY** support video.
- // Cannot determine if embed is a video or not from sites that
- // support multiple embed types such as Facebook.
- // Official list can be found here https://codex.wordpress.org/Embeds
- $video_sites = array(
- 'youtube', // first for performance
- 'collegehumor',
- 'dailymotion',
- 'funnyordie',
- 'ted',
- 'videopress',
- 'vimeo',
- );
-
- $is_video = false;
-
- // Determine if embed is a video
- foreach ( $video_sites as $site ) {
- // Match on `$html` instead of `$url` because of
- // shortened URLs like `youtu.be` will be missed
- if ( strpos( $html, $site ) ) {
- $is_video = true;
- break;
+ function foundationpress_responsive_video_oembed_html( $html, $url, $attr, $post_id ) {
+
+ // Whitelist of oEmbed compatible sites that **ONLY** support video.
+ // Cannot determine if embed is a video or not from sites that
+ // support multiple embed types such as Facebook.
+ // Official list can be found here https://codex.wordpress.org/Embeds
+ $video_sites = array(
+ 'youtube', // first for performance
+ 'collegehumor',
+ 'dailymotion',
+ 'funnyordie',
+ 'ted',
+ 'videopress',
+ 'vimeo',
+ );
+
+ $is_video = false;
+
+ // Determine if embed is a video
+ foreach ( $video_sites as $site ) {
+ // Match on `$html` instead of `$url` because of
+ // shortened URLs like `youtu.be` will be missed
+ if ( strpos( $html, $site ) ) {
+ $is_video = true;
+ break;
+ }
}
- }
- // Process video embed
- if ( true == $is_video ) {
+ // Process video embed
+ if ( true == $is_video ) {
- // Find the `
“”
+- + function start_lvl( &$output, $depth = 0, $args = array() ) { + $GLOBALS['comment_depth'] = $depth + 1; ?> -- id="comment-">
-
+ - id="comment-">
+
-
+
-
+
-
+
- %s', 'foundationpress' ),
+ printf(
+ __( '%s', 'foundationpress' ),
get_comment_author_link()
);
- ?>
-
+ ?>
+
-
+
comment_approved ) : ?>
@@ -85,7 +85,7 @@ function start_el( &$output, $comment, $depth = 0, $args = array(), $id = 0 ) {
- at
+ at
@@ -95,23 +95,24 @@ function start_el( &$output, $comment, $depth = 0, $args = array(), $id = 0 ) {
'max_depth' => $args['max_depth'],
);
- comment_reply_link( array_merge( $args, $reply_args ) ); ?>
-
-
+ comment_reply_link( array_merge( $args, $reply_args ) ); ?>
+
+
-
+ function end_el( & $output, $comment, $depth = 0, $args = array() ) { ?>
-
+
-
+ /** DESTRUCTOR */
+ function __destruct() { ?>
-
+- + + function end_lvl( &$output, $depth = 0, $args = array() ) { + $GLOBALS['comment_depth'] = $depth + 1; ?> -
+ - + /** START_EL */ + function start_el( &$output, $comment, $depth = 0, $args = array(), $id = 0 ) { + $depth++; + $GLOBALS['comment_depth'] = $depth; + $GLOBALS['comment'] = $comment; + $parent_class = ( empty( $args['has_children'] ) ? '' : 'parent' ); ?> -