Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use a filter for wp_title instead of hard-coding things in header.php #79

Merged
merged 2 commits into from Nov 28, 2012
Merged

Use a filter for wp_title instead of hard-coding things in header.php #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b01b14a
Renaming inc/tweaks.php to inc/extras.php and including by default in…
kovshenin Sep 14, 2012
3517c7a
Use a filter for wp_title instead of hard-coding things in header.php
kovshenin Sep 14, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion functions.php
View file
Open in desktop
Expand Up @@ -34,7 +34,7 @@ function _s_setup() {
/** /**
* Custom functions that act independently of the theme templates * Custom functions that act independently of the theme templates
*/ */
//require( get_template_directory() . '/inc/tweaks.php' ); require( get_template_directory() . '/inc/extras.php' );


/** /**
* Custom Theme Options * Custom Theme Options
Expand Down
24 changes: 2 additions & 22 deletions header.php
View file
Open in desktop
Expand Up @@ -12,27 +12,7 @@
<head> <head>
<meta charset="<?php bloginfo( 'charset' ); ?>" /> <meta charset="<?php bloginfo( 'charset' ); ?>" />
<meta name="viewport" content="width=device-width" /> <meta name="viewport" content="width=device-width" />
<title><?php <title><?php wp_title( '|', true, 'right' ); ?></title>
/*
* Print the <title> tag based on what is being viewed.
*/
global $page, $paged;

wp_title( '|', true, 'right' );

// Add the blog name.
bloginfo( 'name' );

// Add the blog description for the home/front page.
$site_description = get_bloginfo( 'description', 'display' );
if ( $site_description && ( is_home() || is_front_page() ) )
echo " | $site_description";

// Add a page number if necessary:
if ( $paged >= 2 || $page >= 2 )
echo ' | ' . sprintf( __( 'Page %s', '_s' ), max( $paged, $page ) );

?></title>
<link rel="profile" href="http://gmpg.org/xfn/11" /> <link rel="profile" href="http://gmpg.org/xfn/11" />
<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" /> <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
<!--[if lt IE 9]> <!--[if lt IE 9]>
Expand All @@ -59,4 +39,4 @@
</nav><!-- .site-navigation .main-navigation --> </nav><!-- .site-navigation .main-navigation -->
</header><!-- #masthead .site-header --> </header><!-- #masthead .site-header -->


<div id="main" class="site-main"> <div id="main" class="site-main">
29 changes: 28 additions & 1 deletion inc/tweaks.php → inc/extras.php
View file
Open in desktop
Expand Up @@ -49,4 +49,31 @@ function _s_enhanced_image_navigation( $url, $id ) {


return $url; return $url;
} }
add_filter( 'attachment_link', '_s_enhanced_image_navigation', 10, 2 ); add_filter( 'attachment_link', '_s_enhanced_image_navigation', 10, 2 );

/**
* Filters wp_title to print a neat <title> tag based on what is being viewed.
*
* @since _s 1.1
*/
function _s_wp_title( $title, $sep ) {
global $page, $paged;

if ( is_feed() )
return $title;

// Add the blog name
$title .= get_bloginfo( 'name' );

// Add the blog description for the home/front page.
$site_description = get_bloginfo( 'description', 'display' );
if ( $site_description && ( is_home() || is_front_page() ) )
$title .= " $sep $site_description";

// Add a page number if necessary:
if ( $paged >= 2 || $page >= 2 )
$title .= " $sep " . sprintf( __( 'Page %s', '_s' ), max( $paged, $page ) );

return $title;
}
add_filter( 'wp_title', '_s_wp_title', 10, 2 );