Navigation

← Previous Changeset
Next Changeset →

Changeset 1726

Timestamp:

09/30/04 17:56:16 (4 years ago)

Author:

rboren

Message:

Introduce get_template_directory() and bloginfo('stylesheet_directory'). Make comments_popup_script() theme aware.

Files:

trunk/wp-blog-header.php (modified) (2 diffs)
trunk/wp-includes/functions.php (modified) (1 diff)
trunk/wp-includes/template-functions-comment.php (modified) (2 diffs)
trunk/wp-includes/template-functions-general.php (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/wp-blog-header.php

r1697	r1726
193	193	endif;
194	194
195		$wp_template = get_settings('template');
196
197		if ($wp_template == 'default') {
198		$wp_template = '';
199		}
200
201		if (! empty($wp_template)) {
202		$wp_template = "themes/$wp_template/";
203		}
	195	$wp_template_dir = get_template_directory();
204	196
205	197	// Template redirection
…	…
215	207	exit;
216	208	} else if (is_home() &&
217		file_exists(~~ABSPATH . "wp-content/${wp_template}~~index.php")) {
218		$wp_did_template_redirect = true;
219		include(~~ABSPATH . "wp-content/${wp_template}~~index.php");
	209	file_exists("$wp_template_dir/index.php")) {
	210	$wp_did_template_redirect = true;
	211	include("$wp_template_dir/index.php");
220	212	exit;
221	213	} else if (is_single() &&
222		file_exists(~~ABSPATH . "wp-content/${wp_template}~~single.php")) {
223		$wp_did_template_redirect = true;
224		include(~~ABSPATH . "wp-content/${wp_template}~~single.php");
	214	file_exists("$wp_template_dir/single.php")) {
	215	$wp_did_template_redirect = true;
	216	include("$wp_template_dir/single.php");
225	217	exit;
226	218	} else if (is_page() &&
227		file_exists(~~ABSPATH . "wp-content/${wp_template}~~page.php")) {
228		$wp_did_template_redirect = true;
229		include(~~ABSPATH . "wp-content/${wp_template}~~page.php");
	219	file_exists("$wp_template_dir/page.php")) {
	220	$wp_did_template_redirect = true;
	221	include("$wp_template_dir/page.php");
230	222	exit;
231	223	} else if (is_category() &&
232		file_exists(~~ABSPATH . "wp-content/${wp_template}~~category.php")) {
233		$wp_did_template_redirect = true;
234		include(~~ABSPATH . "wp-content/${wp_template}~~category.php");
	224	file_exists("$wp_template_dir/category.php")) {
	225	$wp_did_template_redirect = true;
	226	include("$wp_template_dir/category.php");
235	227	exit;
236	228	} else if (is_author() &&
237		file_exists(~~ABSPATH . "wp-content/${wp_template}~~author.php")) {
238		$wp_did_template_redirect = true;
239		include(~~ABSPATH . "wp-content/${wp_template}~~author.php");
	229	file_exists("$wp_template_dir/author.php")) {
	230	$wp_did_template_redirect = true;
	231	include("$wp_template_dir/author.php");
240	232	exit;
241	233	} else if (is_date() &&
242		file_exists(~~ABSPATH . "wp-content/${wp_template}~~date.php")) {
	234	file_exists("$wp_template_dir/date.php")) {
243	235	$wp_did_date = true;
244	236	$wp_did_template_redirect = true;
245		include(~~ABSPATH . "wp-content/${wp_template}~~date.php");
	237	include("$wp_template_dir/date.php");
246	238	exit;
247	239	} else if (is_archive() &&
248		file_exists(~~ABSPATH . "wp-content/${wp_template}~~archive.php")) {
249		$wp_did_template_redirect = true;
250		include(~~ABSPATH . "wp-content/${wp_template}~~archive.php");
	240	file_exists("$wp_template_dir/archive.php")) {
	241	$wp_did_template_redirect = true;
	242	include("$wp_template_dir/archive.php");
251	243	exit;
252	244	} else if (is_search() &&
253		file_exists(~~ABSPATH . "wp-content/${wp_template}~~search.php")) {
254		$wp_did_template_redirect = true;
255		include(~~ABSPATH . "wp-content/${wp_template}~~search.php");
	245	file_exists("$wp_template_dir/search.php")) {
	246	$wp_did_template_redirect = true;
	247	include("$wp_template_dir/search.php");
256	248	exit;
257	249	} else if (is_404() &&
258		file_exists(~~ABSPATH . "wp-content/${wp_template}~~404.php")) {
259		$wp_did_template_redirect = true;
260		include(~~ABSPATH . "wp-content/${wp_template}~~404.php");
261		exit;
262		} else if (file_exists(~~ABSPATH . "wp-content/${wp_template}~~index.php"))
	250	file_exists("$wp_template_dir/404.php")) {
	251	$wp_did_template_redirect = true;
	252	include("$wp_template_dir/404.php");
	253	exit;
	254	} else if (file_exists("$wp_template_dir/index.php"))
263	255	{
264	256	$wp_did_template_redirect = true;
265		include(~~ABSPATH . "wp-content/${wp_template}~~index.php");
	257	include("$wp_template_dir/index.php");
266	258	exit;
267	259	}

trunk/wp-includes/functions.php

r1724	r1726
1705	1705	}
1706	1706
	1707	function get_template_directory() {
	1708	$template = get_settings('template');
	1709
	1710	if (empty($template) \|\| $template == 'default') {
	1711	$template = ABSPATH . "wp-content";
	1712	} else {
	1713	$template = ABSPATH . "wp-content/themes/$template";
	1714	}
	1715
	1716	return $template;
	1717	}
	1718
1707	1719	?>

trunk/wp-includes/template-functions-comment.php

r1669	r1726
27	27	$comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = '$post->ID' AND comment_approved = '1' ORDER BY comment_date");
28	28
29		$wp_template = get_settings('template');
30		if ($wp_template == 'default') {
31		$wp_template = '';
32		} else {
33		$wp_template = ABSPATH . "wp-content/themes/$wp_template/comments.php";
34		}
35
36		if(! empty($wp_template) && file_exists($wp_template)) {
37		include($wp_template);
	29	$template = get_template_directory();
	30	$template .= "/comments.php";
	31
	32	if (file_exists($template)) {
	33	include($template);
38	34	} else {
39	35	include(ABSPATH . 'wp-comments.php');
…	…
76	72	function comments_popup_script($width=400, $height=400, $file='wp-comments-popup.php') {
77	73	global $wpcommentspopupfile, $wptrackbackpopupfile, $wppingbackpopupfile, $wpcommentsjavascript;
78		$wpcommentspopupfile = $file;
	74
	75	if (empty ($file)) {
	76	$template = get_template_directory();
	77	$template .= '/comments-popup.php';
	78	if (file_exists($template)) {
	79	$wpcommentspopupfile = $template;
	80	} else {
	81	$wpcommentspopupfile = 'wp-comments-popup.php';
	82	}
	83	} else {
	84	$wpcommentspopupfile = $file;
	85	}
	86
79	87	$wpcommentsjavascript = 1;
80	88	$javascript = "<script type=\"text/javascript\">\nfunction wpopen (macagna) {\n window.open(macagna, '_blank', 'width=$width,height=$height,scrollbars=yes,status=yes');\n}\n</script>\n";

trunk/wp-includes/template-functions-general.php

r1683	r1726
52	52	function get_bloginfo($show='') {
53	53
54		switch($show) {
55		case 'url':
56		case 'siteurl':
57		$output = get_settings('home');
58		break;
59		case 'description':
60		$output = get_settings('blogdescription');
61		break;
62		case 'rdf_url':
63		$output = get_feed_link('rdf');
64		break;
65		case 'rss_url':
66		$output = get_feed_link('rss');
67		break;
68		case 'rss2_url':
69		$output = get_feed_link('rss2');
70		break;
71		case 'atom_url':
72		$output = get_feed_link('atom');
73		break;
74		case 'comments_rss2_url':
75		$output = get_feed_link('comments_rss2');
76		break;
77		case 'pingback_url':
78		$output = get_settings('siteurl') .'/xmlrpc.php';
79		break;
80		case 'stylesheet_url':
81		$output = get_settings('stylesheet');;
82		if (empty($output) \|\| $output == 'default') {
83		$output = get_settings('siteurl') . "/wp-layout.css";
84		} else {
85		$output = get_settings('siteurl') . "/wp-content/themes/$output/style.css";
86		}
87		break;
88		case 'template_url':
89		$output = get_settings('template');;
90		if (empty($output) \|\| $output == 'default') {
91		$output = get_settings('siteurl');
92		} else {
93		$output = get_settings('siteurl') . "/wp-content/themes/$output";
94		}
95		break;
96		case 'admin_email':
97		$output = get_settings('admin_email');
98		break;
99		case 'charset':
100		$output = get_settings('blog_charset');
101		if ('' == $output) $output = 'UTF-8';
102		break;
103		case 'version':
104		global $wp_version;
105		$output = $wp_version;
106		break;
107		case 'name':
108		default:
109		$output = get_settings('blogname');
110		break;
111		}
112		return $output;
	54	switch($show) {
	55	case 'url':
	56	case 'siteurl':
	57	$output = get_settings('home');
	58	break;
	59	case 'description':
	60	$output = get_settings('blogdescription');
	61	break;
	62	case 'rdf_url':
	63	$output = get_feed_link('rdf');
	64	break;
	65	case 'rss_url':
	66	$output = get_feed_link('rss');
	67	break;
	68	case 'rss2_url':
	69	$output = get_feed_link('rss2');
	70	break;
	71	case 'atom_url':
	72	$output = get_feed_link('atom');
	73	break;
	74	case 'comments_rss2_url':
	75	$output = get_feed_link('comments_rss2');
	76	break;
	77	case 'pingback_url':
	78	$output = get_settings('siteurl') .'/xmlrpc.php';
	79	break;
	80	case 'stylesheet_url':
	81	$output = get_settings('stylesheet');;
	82	if (empty($output) \|\| $output == 'default') {
	83	$output = get_settings('siteurl') . "/wp-layout.css";
	84	} else {
	85	$output = get_settings('siteurl') . "/wp-content/themes/$output/style.css";
	86	}
	87	break;
	88	case 'stylesheet_directory':
	89	$output = get_settings('stylesheet');;
	90	if (empty($output) \|\| $output == 'default') {
	91	$output = get_settings('siteurl');
	92	} else {
	93	$output = get_settings('siteurl') . "/wp-content/themes/$output";
	94	}
	95	break;
	96	case 'template_directory':
	97	case 'template_url':
	98	$output = get_settings('template');;
	99	if (empty($output) \|\| $output == 'default') {
	100	$output = get_settings('siteurl');
	101	} else {
	102	$output = get_settings('siteurl') . "/wp-content/themes/$output";
	103	}
	104	break;
	105	case 'admin_email':
	106	$output = get_settings('admin_email');
	107	break;
	108	case 'charset':
	109	$output = get_settings('blog_charset');
	110	if ('' == $output) $output = 'UTF-8';
	111	break;
	112	case 'version':
	113	global $wp_version;
	114	$output = $wp_version;
	115	break;
	116	case 'name':
	117	default:
	118	$output = get_settings('blogname');
	119	break;
	120	}
	121	return $output;
113	122	}
114	123

Navigation

Changeset 1726

Legend:

trunk/wp-blog-header.php

trunk/wp-includes/functions.php

trunk/wp-includes/template-functions-comment.php

trunk/wp-includes/template-functions-general.php

Download in other formats: