Merge changes, add in $file.

git-svn-id: http://svn.automattic.com/wordpress/trunk@502 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2003-10-30 18:33:49 +00:00 · 2003-10-30 18:33:49 +00:00 · 542b14ee26
parent 44365a46d5
commit 542b14ee26
1 changed files with 2 additions and 2 deletions
--- a/b2-include/b2template.functions.php
+++ b/b2-include/b2template.functions.php
@ -1407,8 +1407,8 @@ function trackback_rdf($timezone = 0) {

 /***** Permalink tags *****/
 function get_permalink($id=false) {
-	global $post, $wpdb, $tableposts, $siteurl;
-	global  $querystring_start, $querystring_equal; 
+	global $post, $wpdb, $tableposts;
+	global $file, $siteurl, $querystring_start, $querystring_equal;
 	$rewritecode = array(
 		'%year%',
 		'%monthnum%',