Merge changes, add in $file.
git-svn-id: http://svn.automattic.com/wordpress/trunk@502 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
44365a46d5
commit
542b14ee26
|
@ -1407,8 +1407,8 @@ function trackback_rdf($timezone = 0) {
|
||||||
|
|
||||||
/***** Permalink tags *****/
|
/***** Permalink tags *****/
|
||||||
function get_permalink($id=false) {
|
function get_permalink($id=false) {
|
||||||
global $post, $wpdb, $tableposts, $siteurl;
|
global $post, $wpdb, $tableposts;
|
||||||
global $querystring_start, $querystring_equal;
|
global $file, $siteurl, $querystring_start, $querystring_equal;
|
||||||
$rewritecode = array(
|
$rewritecode = array(
|
||||||
'%year%',
|
'%year%',
|
||||||
'%monthnum%',
|
'%monthnum%',
|
||||||
|
|
Loading…
Reference in New Issue