Permalink
Browse files

Update some function calls to new standards.

  • Loading branch information...
1 parent b7d7440 commit c35dd602b7b8fd3fabf71d3a95ad4efe637d8923 @beastaugh committed Mar 11, 2011
@@ -422,7 +422,7 @@ function tarski_admin_style() {
wp_enqueue_style(
'tarski_admin',
- get_bloginfo('template_directory') . '/library/css/admin.css',
+ get_template_directory_uri() . '/library/css/admin.css',
array(), false, 'screen'
);
}
@@ -7,7 +7,7 @@
<div class="content">
<p><?php printf(
__('Looks like there&#8127;s nothing here, sorry. You might want to try the search function. Alternatively, return to the %s.', 'tarski'),
- '<a href="' . get_bloginfo('url') . '/">' . __('front page', 'tarski') . '</a>'
+ '<a href="' . home_url() . '/">' . __('front page', 'tarski') . '</a>'
); ?></p>
</div>
@@ -1,11 +1,11 @@
<?php if (!is_numeric(get_raw_tarski_option('deleted'))) { if (isset($_GET['restored'])) { ?>
<div class="updated fade below-h2"><p><?php printf(
__('Tarski options have been restored. %s', 'tarski'),
- '<a href="' . user_trailingslashit(get_bloginfo('url')) . '">' . __('View site &rsaquo;','tarski') . '</a>'
+ '<a href="' . user_trailingslashit(home_url()) . '">' . __('View site &rsaquo;','tarski') . '</a>'
); ?></p></div>
<?php } elseif (isset($_GET['updated'])) { ?>
<div class="updated fade below-h2"><p><?php printf(
__('Tarski options have been updated. %s', 'tarski'),
- '<a href="' . user_trailingslashit(get_bloginfo('url')) . '">' . __('View site &rsaquo;','tarski') . '</a>'
+ '<a href="' . user_trailingslashit(home_url()) . '">' . __('View site &rsaquo;','tarski') . '</a>'
); ?></p></div>
<?php } } ?>
View
@@ -5,7 +5,7 @@
<div class="archive">
<?php if (is_category()) { // Category header ?>
<div class="meta">
- <h1><?php echo single_cat_title(); ?></h1>
+ <h1><?php single_cat_title(); ?></h1>
</div>
<div class="content">
@@ -269,7 +269,7 @@ function tarski_admin_header_style() { ?>
function tarski_inject_styles() {
wp_enqueue_style(
'tarski_options',
- get_bloginfo('template_directory') . '/library/css/options.css',
+ get_template_directory_uri() . '/library/css/options.css',
array(), false, 'screen'
);
}
@@ -285,7 +285,7 @@ function tarski_inject_styles() {
* @return void
*/
function tarski_inject_scripts() {
- $js_dir = get_bloginfo('template_directory') . '/app/js';
+ $js_dir = get_template_directory_uri() . '/app/js';
wp_enqueue_script('page_select', tarski_js("$js_dir/page_select.js"));
wp_enqueue_script('header_select', tarski_js("$js_dir/header_select.js"));
}
@@ -121,7 +121,7 @@ function tarski_avatar() {
* @return string
*/
function tarski_default_avatar($avatar_defaults) {
- $tarski_avatar = get_bloginfo('template_directory') . '/images/avatar.png';
+ $tarski_avatar = get_template_directory_uri() . '/images/avatar.png';
$avatar_defaults[$tarski_avatar] = 'Tarski';
return $avatar_defaults;
}
@@ -351,7 +351,7 @@ function tarski_post_metadata_edit($metadata) {
function tarski_404_content() {
$content = sprintf(
__('The page you are looking for does not exist; it may have been moved, or removed altogether. You might want to try the search function or return to the %s.','tarski'),
- '<a href="' . user_trailingslashit(get_bloginfo('url')) . '">' . __('front page', 'tarski') . '</a>'
+ '<a href="' . user_trailingslashit(home_url()) . '">' . __('front page', 'tarski') . '</a>'
);
$content = wpautop($content);
$content = apply_filters('th_404_content', $content);
@@ -75,9 +75,9 @@ function multiple_tag_titles($format = '') {
return;
if ( $tag_slugs = get_query_var('tag_slug__and') )
- $connective = __('and');
+ $connective = __('and', 'tarski');
elseif ( $tag_slugs = get_query_var('tag_slug__in') )
- $connective = __('or');
+ $connective = __('or', 'tarski');
else
$single_tag = intval( get_query_var('tag_id') );
@@ -193,7 +193,7 @@ function tarski_stylesheets() {
'main' => array(
'url' => get_bloginfo('stylesheet_url')),
'print' => array(
- 'url' => get_bloginfo('template_directory') . '/library/css/print.css',
+ 'url' => get_template_directory_uri() . '/library/css/print.css',
'media' => 'print'));
if (get_tarski_option('style')) {
@@ -244,7 +244,7 @@ function tarski_stylesheets() {
function tarski_javascript() {
$scripts = array();
$files = array(
- 'tarski-js' => get_bloginfo('template_directory') . '/app/js/tarski.js',
+ 'tarski-js' => get_template_directory_uri() . '/app/js/tarski.js',
'comment-reply' => site_url('wp-includes/js/comment-reply.js'));
foreach ($files as $name => $url) {
@@ -313,7 +313,7 @@ function tarski_headerimage() {
$header_img_tag = sprintf(
'<a title="%s" rel="home" href="%s">%s</a>',
__('Return to main page', 'tarski'),
- user_trailingslashit(get_bloginfo('url')),
+ user_trailingslashit(home_url()),
$header_img_tag);
echo "<div id=\"header-image\">$header_img_tag</div>\n\n";
@@ -338,7 +338,7 @@ function tarski_sitetitle() {
$site_title = sprintf(
'<a title="%1$s" href="%2$s" rel="home">%3$s</a>',
__('Return to main page','tarski'),
- user_trailingslashit(get_bloginfo('url')),
+ user_trailingslashit(home_url()),
$site_title
);
}
@@ -454,7 +454,7 @@ function _tarski_navbar_home_link($navbar) {
$navbar['home'] = sprintf(
'<li><a id="nav-home"%1$s href="%2$s" rel="home">%3$s</a></li>',
is_home() ? ' class="nav-current"' : '',
- user_trailingslashit(get_bloginfo('url')),
+ user_trailingslashit(home_url()),
home_link_name());
return $navbar;
View
@@ -26,7 +26,7 @@
<h1 class="title"><?php _e('No results','tarski'); ?></h1>
</div>
<div class="content">
- <p><?php printf( __('Your search for %1$s returned no results. Try returning to the %2$s.','tarski'), '<strong>' . esc_html(get_search_query()) . '</strong>', '<a href="' . get_bloginfo('url') . '">' . __('front page','tarski') . '</a>' ); ?></p>
+ <p><?php printf( __('Your search for %1$s returned no results. Try returning to the %2$s.','tarski'), '<strong>' . esc_html(get_search_query()) . '</strong>', '<a href="' . home_url() . '">' . __('front page','tarski') . '</a>' ); ?></p>
</div>
</div> <!-- /entry -->
View
@@ -1,6 +1,6 @@
<?php $labelText = __('Search this site', 'tarski'); ?>
<div class="searchbox">
- <form method="get" id="searchform" action="<?php bloginfo('url'); ?>"><fieldset>
+ <form method="get" id="searchform" action="<?php echo home_url(); ?>"><fieldset>
<label for="s" id="searchlabel"><?php echo $labelText ?></label>
<input type="search" placeholder="<?php echo $labelText ?>" value="<?php the_search_query(); ?>" name="s" id="s">
<input type="submit" id="searchsubmit" value="<?php _e('Search','tarski'); ?>">

0 comments on commit c35dd60

Please sign in to comment.