- show_default_header_selector(); ?>
@@ -644,8 +646,7 @@ - - +
@@ -659,9 +660,6 @@ */ function step_3() { check_admin_referer('custom-header-crop-image'); - if ( ! current_theme_supports( 'custom-header-uploads' ) ) - wp_die( 'Cheatin’ uh?' ); - if ( $_POST['oitar'] > 1 ) { $_POST['x1'] = $_POST['x1'] * $_POST['oitar']; $_POST['y1'] = $_POST['y1'] * $_POST['oitar']; Index: wp-content/themes/twentyten/header.php =================================================================== --- wp-content/themes/twentyten/header.php (revision 17243) +++ wp-content/themes/twentyten/header.php (working copy) @@ -72,9 +72,9 @@ ( /* $src, $width, $height */ $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'post-thumbnail' ) ) && $image[1] >= HEADER_IMAGE_WIDTH ) : // Houston, we have a new header image! - echo get_the_post_thumbnail( $post->ID ); - elseif ( get_header_image() ) : ?> -
+ * if( '' != get_query_template( '404' ) )
+ * include( get_query_template( '404' ) );
+ *
+ * or the same can be accomplished with
+ *
+ * if( '' != get_404_template() )
+ * include( get_404_template() );
+ *
+ *
* @since 1.5.0
*
* @param string $type Filename without extension.
- * @param array $templates An optional list of template candidates
* @return string Full path to file.
*/
-function get_query_template( $type, $templates = array() ) {
+function get_query_template($type) {
$type = preg_replace( '|[^a-z0-9-]+|', '', $type );
-
- if ( empty( $templates ) )
- $templates = array("{$type}.php");
-
- $templates = apply_filters( "{$type}_template_hierarchy", $templates );
-
- return apply_filters( "{$type}_template", locate_template( $templates ) );
+ return apply_filters("{$type}_template", locate_template(array("{$type}.php")));
}
/**
@@ -780,15 +745,7 @@
* @return string
*/
function get_archive_template() {
- $post_type = get_query_var( 'post_type' );
-
- $templates = array();
-
- if ( $post_type )
- $templates[] = "archive-{$post_type}.php";
- $templates[] = 'archive.php';
-
- return get_query_template( 'archive', $templates );
+ return get_query_template('archive');
}
/**
@@ -799,15 +756,20 @@
* @return string
*/
function get_author_template() {
- $author = get_queried_object();
+ $author_id = absint( get_query_var( 'author' ) );
+ $author = get_user_by( 'id', $author_id );
+ $author = $author->user_nicename;
$templates = array();
- $templates[] = "author-{$author->user_nicename}.php";
- $templates[] = "author-{$author->ID}.php";
+ if ( $author )
+ $templates[] = "author-{$author}.php";
+ if ( $author_id )
+ $templates[] = "author-{$author_id}.php";
$templates[] = 'author.php';
- return get_query_template( 'author', $templates );
+ $template = locate_template( $templates );
+ return apply_filters( 'author_template', $template );
}
/**
@@ -823,15 +785,19 @@
* @return string
*/
function get_category_template() {
- $category = get_queried_object();
+ $cat_ID = absint( get_query_var('cat') );
+ $category = get_category( $cat_ID );
$templates = array();
- $templates[] = "category-{$category->slug}.php";
- $templates[] = "category-{$category->term_id}.php";
+ if ( !is_wp_error($category) )
+ $templates[] = "category-{$category->slug}.php";
+
+ $templates[] = "category-$cat_ID.php";
$templates[] = "category.php";
- return get_query_template( 'category', $templates );
+ $template = locate_template($templates);
+ return apply_filters('category_template', $template);
}
/**
@@ -847,15 +813,19 @@
* @return string
*/
function get_tag_template() {
- $tag = get_queried_object();
+ $tag_id = absint( get_query_var('tag_id') );
+ $tag_name = get_query_var('tag');
$templates = array();
- $templates[] = "tag-{$tag->slug}.php";
- $templates[] = "tag-{$tag->term_id}.php";
+ if ( $tag_name )
+ $templates[] = "tag-$tag_name.php";
+ if ( $tag_id )
+ $templates[] = "tag-$tag_id.php";
$templates[] = "tag.php";
- return get_query_template( 'tag', $templates );
+ $template = locate_template($templates);
+ return apply_filters('tag_template', $template);
}
/**
@@ -870,22 +840,25 @@
* template is used. If none of the files exist, then it will fall back on to
* index.php.
*
- * @since 2.5.0
+ * @since unknown (2.6.0 most likely)
* @uses apply_filters() Calls 'taxonomy_template' filter on found path.
*
* @return string
*/
function get_taxonomy_template() {
- $term = get_queried_object();
- $taxonomy = $term->taxonomy;
+ $taxonomy = get_query_var('taxonomy');
+ $term = get_query_var('term');
$templates = array();
+ if ( $taxonomy && $term )
+ $templates[] = "taxonomy-$taxonomy-$term.php";
+ if ( $taxonomy )
+ $templates[] = "taxonomy-$taxonomy.php";
- $templates[] = "taxonomy-$taxonomy-{$term->slug}.php";
- $templates[] = "taxonomy-$taxonomy.php";
$templates[] = "taxonomy.php";
- return get_query_template( 'taxonomy', $templates );
+ $template = locate_template($templates);
+ return apply_filters('taxonomy_template', $template);
}
/**
@@ -912,9 +885,8 @@
* @return string
*/
function get_home_template() {
- $templates = array( 'home.php', 'index.php' );
-
- return get_query_template( 'home', $templates );
+ $template = locate_template(array('home.php', 'index.php'));
+ return apply_filters('home_template', $template);
}
/**
@@ -928,9 +900,7 @@
* @return string
*/
function get_front_page_template() {
- $templates = array('front-page.php');
-
- return get_query_template( 'front_page', $templates );
+ return apply_filters( 'front_page_template', locate_template( array('front-page.php') ) );
}
/**
@@ -945,13 +915,15 @@
* @return string
*/
function get_page_template() {
- $id = get_queried_object_id();
+ global $wp_query;
+
+ $id = (int) $wp_query->get_queried_object_id();
$template = get_post_meta($id, '_wp_page_template', true);
$pagename = get_query_var('pagename');
if ( !$pagename && $id > 0 ) {
// If a static page is set as the front page, $pagename will not be set. Retrieve it from the queried object
- $post = get_queried_object();
+ $post = $wp_query->get_queried_object();
$pagename = $post->post_name;
}
@@ -967,7 +939,7 @@
$templates[] = "page-$id.php";
$templates[] = "page.php";
- return get_query_template( 'page', $templates );
+ return apply_filters('page_template', locate_template($templates));
}
/**
@@ -1000,14 +972,11 @@
* @return string
*/
function get_single_template() {
- $object = get_queried_object();
+ global $wp_query;
- $templates = array();
-
- $templates[] = "single-{$object->post_type}.php";
- $templates[] = "single.php";
-
- return get_query_template( 'single', $templates );
+ $object = $wp_query->get_queried_object();
+ $templates = array('single-' . $object->post_type . '.php', 'single.php');
+ return apply_filters('single_template', locate_template($templates));
}
/**
@@ -1050,13 +1019,13 @@
* @return string
*/
function get_comments_popup_template() {
- $template = get_query_template( 'comments_popup', array( 'comments-popup.php' ) );
+ $template = locate_template(array("comments-popup.php"));
// Backward compat code will be removed in a future release
if ('' == $template)
$template = ABSPATH . WPINC . '/theme-compat/comments-popup.php';
- return $template;
+ return apply_filters('comments_popup_template', $template);
}
/**
@@ -1067,14 +1036,17 @@
*
* @since 2.7.0
*
- * @param string|array $template_names Template file(s) to search for, in order.
+ * @param array $template_names Array of template files to search for in priority order.
* @param bool $load If true the template file will be loaded if it is found.
* @param bool $require_once Whether to require_once or require. Default true. Has no effect if $load is false.
* @return string The template filename if one is located.
*/
function locate_template($template_names, $load = false, $require_once = true ) {
+ if ( !is_array($template_names) )
+ return '';
+
$located = '';
- foreach ( (array) $template_names as $template_name ) {
+ foreach ( $template_names as $template_name ) {
if ( !$template_name )
continue;
if ( file_exists(STYLESHEETPATH . '/' . $template_name)) {
@@ -1143,10 +1115,6 @@
if ( !current_user_can( 'switch_themes' ) )
return;
- // Admin Thickbox requests
- if ( isset( $_GET['preview_iframe'] ) )
- show_admin_bar( false );
-
$_GET['template'] = preg_replace('|[^a-z0-9_./-]|i', '', $_GET['template']);
if ( validate_file($_GET['template']) )
@@ -1239,27 +1207,17 @@
/**
* Switches current theme to new template and stylesheet names.
*
- * @since 2.5.0
+ * @since unknown
* @uses do_action() Calls 'switch_theme' action on updated theme display name.
*
* @param string $template Template name
* @param string $stylesheet Stylesheet name.
*/
function switch_theme($template, $stylesheet) {
- global $wp_theme_directories;
-
update_option('template', $template);
update_option('stylesheet', $stylesheet);
- if ( count($wp_theme_directories) > 1 ) {
- update_option('template_root', get_raw_theme_root($template, true));
- update_option('stylesheet_root', get_raw_theme_root($stylesheet, true));
- }
delete_option('current_theme');
$theme = get_current_theme();
- if ( is_admin() && false === get_option( "theme_mods_$stylesheet" ) ) {
- $default_theme_mods = (array) get_option( "mods_$theme" );
- add_option( "theme_mods_$stylesheet", $default_theme_mods );
- }
do_action('switch_theme', $theme);
}
@@ -1291,35 +1249,10 @@
return false;
}
- if ( is_child_theme() && ! file_exists( get_stylesheet_directory() . '/style.css' ) ) {
- switch_theme( WP_DEFAULT_THEME, WP_DEFAULT_THEME );
- return false;
- }
-
return true;
}
/**
- * Retrieve all theme modifications.
- *
- * @since 3.1.0
- *
- * @return array Theme modifications.
- */
-function get_theme_mods() {
- $theme_slug = get_option( 'stylesheet' );
- if ( false === ( $mods = get_option( "theme_mods_$theme_slug" ) ) ) {
- $theme_name = get_current_theme();
- $mods = get_option( "mods_$theme_name" ); // Deprecated location.
- if ( is_admin() && false !== $mods ) {
- update_option( "theme_mods_$theme_slug", $mods );
- delete_option( "mods_$theme_name" );
- }
- }
- return $mods;
-}
-
-/**
* Retrieve theme modification value for the current theme.
*
* If the modification name does not exist, then the $default will be passed
@@ -1334,13 +1267,15 @@
* @param bool|string $default
* @return string
*/
-function get_theme_mod( $name, $default = false ) {
- $mods = get_theme_mods();
+function get_theme_mod($name, $default = false) {
+ $theme = get_current_theme();
- if ( isset( $mods[ $name ] ) )
- return apply_filters( "theme_mod_$name", $mods[ $name ] );
+ $mods = get_option( "mods_$theme" );
- return apply_filters( "theme_mod_$name", sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() ) );
+ if ( isset($mods[$name]) )
+ return apply_filters( "theme_mod_$name", $mods[$name] );
+
+ return apply_filters( "theme_mod_$name", sprintf($default, get_template_directory_uri(), get_stylesheet_directory_uri()) );
}
/**
@@ -1351,13 +1286,15 @@
* @param string $name Theme modification name.
* @param string $value theme modification value.
*/
-function set_theme_mod( $name, $value ) {
- $mods = get_theme_mods();
+function set_theme_mod($name, $value) {
+ $theme = get_current_theme();
- $mods[ $name ] = $value;
+ $mods = get_option("mods_$theme");
- $theme = get_option( 'stylesheet' );
- update_option( "theme_mods_$theme", $mods );
+ $mods[$name] = $value;
+
+ update_option("mods_$theme", $mods);
+ wp_cache_delete("mods_$theme", 'options');
}
/**
@@ -1372,18 +1309,20 @@
* @return null
*/
function remove_theme_mod( $name ) {
- $mods = get_theme_mods();
+ $theme = get_current_theme();
- if ( ! isset( $mods[ $name ] ) )
+ $mods = get_option("mods_$theme");
+
+ if ( !isset($mods[$name]) )
return;
- unset( $mods[ $name ] );
+ unset($mods[$name]);
- if ( empty( $mods ) )
+ if ( empty($mods) )
return remove_theme_mods();
- $theme = get_option( 'stylesheet' );
- update_option( "theme_mods_$theme", $mods );
+ update_option("mods_$theme", $mods);
+ wp_cache_delete("mods_$theme", 'options');
}
/**
@@ -1392,8 +1331,9 @@
* @since 2.1.0
*/
function remove_theme_mods() {
- delete_option( 'theme_mods_' . get_option( 'stylesheet' ) );
- delete_option( 'mods_' . get_current_theme() );
+ $theme = get_current_theme();
+
+ delete_option("mods_$theme");
}
/**
@@ -1428,16 +1368,9 @@
* @return string
*/
function get_header_image() {
- $default = defined( 'HEADER_IMAGE' ) ? HEADER_IMAGE : '';
+ $default = defined('HEADER_IMAGE') ? HEADER_IMAGE : '';
- $url = get_theme_mod( 'header_image', $default );
-
- if ( is_ssl() )
- $url = str_replace( 'http://', 'https://', $url );
- else
- $url = str_replace( 'https://', 'http://', $url );
-
- return $url;
+ return get_theme_mod('header_image', $default);
}
/**
@@ -1464,49 +1397,20 @@
* @param callback $admin_header_callback Call on custom header administration screen.
* @param callback $admin_image_div_callback Output a custom header image div on the custom header administration screen. Optional.
*/
-function add_custom_image_header( $header_callback, $admin_header_callback, $admin_image_div_callback = '' ) {
- if ( ! empty( $header_callback ) )
+function add_custom_image_header($header_callback, $admin_header_callback, $admin_image_div_callback = '') {
+ if ( ! empty($header_callback) )
add_action('wp_head', $header_callback);
- add_theme_support( 'custom-header', array( 'callback' => $header_callback ) );
- add_theme_support( 'custom-header-uploads' );
+ add_theme_support( 'custom-header' );
if ( ! is_admin() )
return;
-
- global $custom_image_header;
-
- require_once( ABSPATH . 'wp-admin/custom-header.php' );
- $custom_image_header = new Custom_Image_Header( $admin_header_callback, $admin_image_div_callback );
- add_action( 'admin_menu', array( &$custom_image_header, 'init' ) );
+ require_once(ABSPATH . 'wp-admin/custom-header.php');
+ $GLOBALS['custom_image_header'] =& new Custom_Image_Header($admin_header_callback, $admin_image_div_callback);
+ add_action('admin_menu', array(&$GLOBALS['custom_image_header'], 'init'));
}
/**
- * Remove image header support.
- *
- * @since 3.1.0
- * @see add_custom_image_header()
- *
- * @return bool Whether support was removed.
- */
-function remove_custom_image_header() {
- if ( ! current_theme_supports( 'custom-header' ) )
- return false;
-
- $callback = get_theme_support( 'custom-header' );
- remove_action( 'wp_head', $callback[0]['callback'] );
- _remove_theme_support( 'custom-header' );
- remove_theme_support( 'custom-header-uploads' );
-
- if ( is_admin() ) {
- remove_action( 'admin_menu', array( &$GLOBALS['custom_image_header'], 'init' ) );
- unset( $GLOBALS['custom_image_header'] );
- }
-
- return true;
-}
-
-/**
* Register a selection of default headers to be displayed by the custom header admin UI.
*
* @since 3.0.0
@@ -1528,7 +1432,7 @@
* @see register_default_headers()
* @since 3.0.0
*
- * @param string|array $header The header string id (key of array) to remove, or an array thereof.
+ * @param string|array The header string id (key of array) to remove, or an array thereof.
* @return True on success, false on failure.
*/
function unregister_default_headers( $header ) {
@@ -1566,6 +1470,28 @@
}
/**
+ * Retrieve background image alt attribute for custom background.
+ *
+ * @uses HEADER_ALT
+ *
+ * @return string
+ */
+function get_header_alt() {
+ $default = defined('HEADER_ALT') ? HEADER_ALT : '';
+
+ return get_theme_mod('header_alt', $default);
+}
+
+/**
+ * Display background image alt attribute.
+ *
+ *
+ */
+function header_alt() {
+ echo get_header_alt();
+}
+
+/**
* Retrieve value for custom background color.
*
* @since 3.0.0
@@ -1603,49 +1529,25 @@
* @param callback $admin_header_callback Call on custom background administration screen.
* @param callback $admin_image_div_callback Output a custom background image div on the custom background administration screen. Optional.
*/
-function add_custom_background( $header_callback = '', $admin_header_callback = '', $admin_image_div_callback = '' ) {
- if ( isset( $GLOBALS['custom_background'] ) )
+function add_custom_background($header_callback = '', $admin_header_callback = '', $admin_image_div_callback = '') {
+ if ( isset($GLOBALS['custom_background']) )
return;
- if ( empty( $header_callback ) )
+ if ( empty($header_callback) )
$header_callback = '_custom_background_cb';
- add_action( 'wp_head', $header_callback );
+ add_action('wp_head', $header_callback);
- add_theme_support( 'custom-background', array( 'callback' => $header_callback ) );
+ add_theme_support( 'custom-background' );
if ( ! is_admin() )
return;
- require_once( ABSPATH . 'wp-admin/custom-background.php' );
- $GLOBALS['custom_background'] =& new Custom_Background( $admin_header_callback, $admin_image_div_callback );
- add_action( 'admin_menu', array( &$GLOBALS['custom_background'], 'init' ) );
+ require_once(ABSPATH . 'wp-admin/custom-background.php');
+ $GLOBALS['custom_background'] =& new Custom_Background($admin_header_callback, $admin_image_div_callback);
+ add_action('admin_menu', array(&$GLOBALS['custom_background'], 'init'));
}
/**
- * Remove custom background support.
- *
- * @since 3.1.0
- * @see add_custom_background()
- *
- * @return bool Whether support was removed.
- */
-function remove_custom_background() {
- if ( ! current_theme_supports( 'custom-background' ) )
- return false;
-
- $callback = get_theme_support( 'custom-background' );
- remove_action( 'wp_head', $callback[0]['callback'] );
- _remove_theme_support( 'custom-background' );
-
- if ( is_admin() ) {
- remove_action( 'admin_menu', array( &$GLOBALS['custom_background'], 'init' ) );
- unset( $GLOBALS['custom_background'] );
- }
-
- return true;
-}
-
-/**
* Default custom background callback.
*
* @since 3.0.0
@@ -1694,10 +1596,6 @@
* the theme root. It also accepts an array of stylesheets.
* It is optional and defaults to 'editor-style.css'.
*
- * Supports RTL stylesheets automatically by searching for the -rtl prefix, e.g.
- * editor-style-rtl.css. If an array of stylesheets is passed to add_editor_style(),
- * RTL is only added for the first stylesheet.
- *
* @since 3.0.0
*
* @param mixed $stylesheet Optional. Stylesheet name or array thereof, relative to theme root.
@@ -1722,22 +1620,6 @@
}
/**
- * Removes all visual editor stylesheets.
- *
- * @since 3.1.0
- *
- * @return bool True on success, false if there were no stylesheets to remove.
- */
-function remove_editor_styles() {
- if ( ! current_theme_supports( 'editor-style' ) )
- return false;
- _remove_theme_support( 'editor-style' );
- if ( is_admin() )
- $GLOBALS['editor_styles'] = array();
- return true;
-}
-
-/**
* Allows a theme to register its support of a certain feature
*
* Must be called in the theme's functions.php file to work.
@@ -1754,27 +1636,9 @@
$_wp_theme_features[$feature] = true;
else
$_wp_theme_features[$feature] = array_slice( func_get_args(), 1 );
-
- if ( $feature == 'post-formats' && is_array( $_wp_theme_features[$feature][0] ) )
- $_wp_theme_features[$feature][0] = array_intersect( $_wp_theme_features[$feature][0], array_keys( get_post_format_slugs() ) );
}
/**
- * Gets the theme support arguments passed when registering that support
- *
- * @since 3.1
- * @param string $feature the feature to check
- * @return array The array of extra arguments
- */
-function get_theme_support( $feature ) {
- global $_wp_theme_features;
- if ( !isset( $_wp_theme_features[$feature] ) )
- return false;
- else
- return $_wp_theme_features[$feature];
-}
-
-/**
* Allows a theme to de-register its support of a certain feature
*
* Should be called in the theme's functions.php file. Generally would
@@ -1789,16 +1653,7 @@
// Blacklist: for internal registrations not used directly by themes.
if ( in_array( $feature, array( 'custom-background', 'custom-header', 'editor-style', 'widgets', 'menus' ) ) )
return false;
- return _remove_theme_support( $feature );
-}
-/**
- * Do not use. Removes theme support internally, ignorant of the blacklist.
- *
- * @access private
- * @since 3.1.0
- */
-function _remove_theme_support( $feature ) {
global $_wp_theme_features;
if ( ! isset( $_wp_theme_features[$feature] ) )