From 2842d832a677d50d3081a7fc94fcdd3e80e6b0dd Mon Sep 17 00:00:00 2001
From: Matt Mullenweg <matt@git.wordpress.org>
Date: Thu, 30 Oct 2003 18:33:49 +0000
Subject: [PATCH] Merge changes, add in $file.

git-svn-id: https://develop.svn.wordpress.org/trunk@502 602fd350-edb4-49c9-b593-d223f7449a82
---
 b2-include/b2template.functions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2-include/b2template.functions.php b/b2-include/b2template.functions.php
index c1c538f476..024bf62862 100644
--- 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%',