1 | 346c346,349 |
---|
2 | < if ( file_exists(TEMPLATEPATH . "/{$type}.php") ) |
---|
3 | --- |
---|
4 | > if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists(STYLESHEETPATH . "/{$type}.php") ) |
---|
5 | > $template = STYLESHEETPATH . "/{$type}.php"; |
---|
6 | > |
---|
7 | > elseif ( file_exists(TEMPLATEPATH . "/{$type}.php") ) |
---|
8 | 366c369,371 |
---|
9 | < if ( file_exists(TEMPLATEPATH . "/category-" . absint( get_query_var('cat') ) . '.php') ) |
---|
10 | --- |
---|
11 | > if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists(STYLESHEETPATH . "/category-" . absint( get_query_var('cat') ) . '.php') ) |
---|
12 | > $template = STYLESHEETPATH . "/category-" . absint( get_query_var('cat') ) . '.php'; |
---|
13 | > elseif ( file_exists(TEMPLATEPATH . "/category-" . absint( get_query_var('cat') ) . '.php') ) |
---|
14 | 367a373,374 |
---|
15 | > elseif ( TEMPLATEPATH !== STYLESHEETPATH && file_exists(STYLESHEETPATH . "/category.php") ) |
---|
16 | > $template = STYLESHEETPATH . "/category.php"; |
---|
17 | 376c383,385 |
---|
18 | < if ( file_exists(TEMPLATEPATH . "/tag-" . get_query_var('tag') . '.php') ) |
---|
19 | --- |
---|
20 | > if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists(STYLESHEETPATH . "/tag-" . get_query_var('tag') . '.php') ) |
---|
21 | > $template = STYLESHEETPATH . "/tag-" . get_query_var('tag') . '.php'; |
---|
22 | > elseif ( file_exists(TEMPLATEPATH . "/tag-" . get_query_var('tag') . '.php') ) |
---|
23 | 377a387,389 |
---|
24 | > |
---|
25 | > elseif ( TEMPLATEPATH !== STYLESHEETPATH && file_exists(STYLESHEETPATH . "/tag.php") ) |
---|
26 | > $template = STYLESHEETPATH . "/tag.php"; |
---|
27 | 388c400,403 |
---|
28 | < if ( $taxonomy && $term && file_exists(TEMPLATEPATH . "/taxonomy-$taxonomy-$term.php") ) |
---|
29 | --- |
---|
30 | > |
---|
31 | > if ( TEMPLATEPATH !== STYLESHEETPATH && ($taxonomy && $term && file_exists(STYLESHEETPATH . "/taxonomy-$taxonomy-$term.php") ) ) |
---|
32 | > $template = STYLESHEETPATH . "/taxonomy-$taxonomy-$term.php"; |
---|
33 | > elseif ( $taxonomy && $term && file_exists(TEMPLATEPATH . "/taxonomy-$taxonomy-$term.php") ) |
---|
34 | 389a405,407 |
---|
35 | > |
---|
36 | > elseif (TEMPLATEPATH !== STYLESHEETPATH && ( $taxonomy && file_exists(STYLESHEETPATH . "/taxonomy-$taxonomy.php") ) ) |
---|
37 | > $template = STYLESHEETPATH . "/taxonomy-$taxonomy.php"; |
---|
38 | 391a410,412 |
---|
39 | > |
---|
40 | > elseif ( TEMPLATEPATH !== STYLESHEETPATH && file_exists(STYLESHEETPATH . "/taxonomy.php") ) |
---|
41 | > $template = STYLESHEETPATH . "/taxonomy.php"; |
---|
42 | 405c426,428 |
---|
43 | < if ( file_exists(TEMPLATEPATH . "/home.php") ) |
---|
44 | --- |
---|
45 | > if (TEMPLATEPATH !== STYLESHEETPATH && file_exists(STYLESHEETPATH . "/home.php") ) |
---|
46 | > $template = STYLESHEETPATH . "/home.php"; |
---|
47 | > elseif ( file_exists(TEMPLATEPATH . "/home.php") ) |
---|
48 | 406a430,432 |
---|
49 | > |
---|
50 | > elseif ( TEMPLATEPATH !== STYLESHEETPATH && file_exists(STYLESHEETPATH . "/index.php") ) |
---|
51 | > $template = STYLESHEETPATH . "/index.php"; |
---|
52 | 422c448,450 |
---|
53 | < if ( !empty($template) && !validate_file($template) && file_exists(TEMPLATEPATH . "/$template") ) |
---|
54 | --- |
---|
55 | > if ( TEMPLATEPATH !== STYLESHEETPATH && (!empty($template) && !validate_file($template) && file_exists(STYLESHEETPATH . "/$template") ) ) |
---|
56 | > $template = STYLESHEETPATH. "/$template"; |
---|
57 | > elseif ( !empty($template) && !validate_file($template) && file_exists(TEMPLATEPATH . "/$template") ) |
---|
58 | 423a452,454 |
---|
59 | > |
---|
60 | > elseif (TEMPLATEPATH !== STYLESHEETPATH && file_exists(STYLESHEETPATH . "/page.php") ) |
---|
61 | > $template = STYLESHEETPATH . "/page.php"; |
---|
62 | 458c489,491 |
---|
63 | < if ( file_exists( TEMPLATEPATH . '/comments-popup.php') ) |
---|
64 | --- |
---|
65 | > if (TEMPLATEPATH !== STYLESHEETPATH && file_exists(STYLESHEETPATH . "/comments-popup.php") ) |
---|
66 | > $template = STYLESHEETPATH . "/comments-popup.php"; |
---|
67 | > elseif ( file_exists( TEMPLATEPATH . '/comments-popup.php') ) |
---|
68 | 461c494 |
---|
69 | < $template = get_theme_root() . '/default/comments-popup.php'; |
---|
70 | --- |
---|
71 | > $template = WP_CONTENT_DIR . '/themes/default/comments-popup.php'; |
---|