Index: trunk/phase3/maintenance/archives/patch-transcache.sql
===================================================================
--- trunk/phase3/maintenance/archives/patch-transcache.sql (revision 12921)
+++ trunk/phase3/maintenance/archives/patch-transcache.sql (revision 12922)
@@ -3,5 +3,5 @@
tc_contents TEXT,
tc_time INT NOT NULL,
UNIQUE INDEX tc_url_idx(tc_url)
-);
+) TYPE=InnoDB;
Index: trunk/phase3/maintenance/mysql5/tables.sql
===================================================================
--- trunk/phase3/maintenance/mysql5/tables.sql (revision 12921)
+++ trunk/phase3/maintenance/mysql5/tables.sql (revision 12922)
@@ -851,6 +851,16 @@
) TYPE=InnoDB, DEFAULT CHARSET=utf8;
+--
+-- Cache of interwiki transclusion
+--
+CREATE TABLE /*$wgDBprefix*/transcache (
+ tc_url VARCHAR(255) NOT NULL,
+ tc_contents TEXT,
+ tc_time INT NOT NULL,
+ UNIQUE INDEX tc_url_idx(tc_url)
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
+
-- For article validation
CREATE TABLE /*$wgDBprefix*/validate (
val_user int(11) NOT NULL default '0',
Index: trunk/phase3/maintenance/tables.sql
===================================================================
--- trunk/phase3/maintenance/tables.sql (revision 12921)
+++ trunk/phase3/maintenance/tables.sql (revision 12922)
@@ -838,6 +838,16 @@
) TYPE=InnoDB;
+--
+-- Cache of interwiki transclusion
+--
+CREATE TABLE /*$wgDBprefix*/transcache (
+ tc_url VARCHAR(255) NOT NULL,
+ tc_contents TEXT,
+ tc_time INT NOT NULL,
+ UNIQUE INDEX tc_url_idx(tc_url)
+) TYPE=InnoDB;
+
-- For article validation
CREATE TABLE /*$wgDBprefix*/validate (
val_user int(11) NOT NULL default '0',
Index: trunk/phase3/includes/Parser.php
===================================================================
--- trunk/phase3/includes/Parser.php (revision 12921)
+++ trunk/phase3/includes/Parser.php (revision 12922)
@@ -2359,6 +2359,8 @@
$found = false;
$nowiki = false;
$noparse = false;
+ $replaceHeadings = false;
+ $isHTML = false;
$title = NULL;
@@ -2531,8 +2533,6 @@
}
# Load from database
- $replaceHeadings = false;
- $isHTML = false;
$lastPathLevel = $this->mTemplatePath;
if ( !$found ) {
$ns = NS_TEMPLATE;
@@ -2542,47 +2542,52 @@
}
$title = Title::newFromText( $part1, $ns );
- if ($title) {
- $interwiki = Title::getInterwikiLink($title->getInterwiki());
- if ($interwiki != '' && $title->isTrans()) {
- return $this->scarytransclude($title, $interwiki);
- }
- }
+ if ( !is_null( $title ) ) {
+ if ( !$title->isExternal() ) {
+ # Check for excessive inclusion
+ $dbk = $title->getPrefixedDBkey();
+ if ( $this->incrementIncludeCount( $dbk ) ) {
+ if ( $title->getNamespace() == NS_SPECIAL && $this->mOptions->getAllowSpecialInclusion() ) {
+ # Capture special page output
+ $text = SpecialPage::capturePath( $title );
+ if ( is_string( $text ) ) {
+ $found = true;
+ $noparse = true;
+ $isHTML = true;
+ $this->disableCache();
+ }
+ } else {
+ $articleContent = $this->fetchTemplate( $title );
+ if ( $articleContent !== false ) {
+ $found = true;
+ $text = $articleContent;
+ $replaceHeadings = true;
+ }
+ }
+ }
- if ( !is_null( $title ) && !$title->isExternal() ) {
- # Check for excessive inclusion
- $dbk = $title->getPrefixedDBkey();
- if ( $this->incrementIncludeCount( $dbk ) ) {
- if ( $title->getNamespace() == NS_SPECIAL && $this->mOptions->getAllowSpecialInclusion() ) {
- # Capture special page output
- $text = SpecialPage::capturePath( $title );
- if ( is_string( $text ) ) {
- $found = true;
- $noparse = true;
- $isHTML = true;
- $this->disableCache();
- }
+ # If the title is valid but undisplayable, make a link to it
+ if ( $this->mOutputType == OT_HTML && !$found ) {
+ $text = '[['.$title->getPrefixedText().']]';
+ $found = true;
+ }
+
+ # Template cache array insertion
+ if( $found ) {
+ $this->mTemplates[$part1] = $text;
+ $text = $linestart . $text;
+ }
+ } elseif ( $title->isTrans() ) {
+ // Interwiki transclusion
+ if ( $this->mOutputType == OT_HTML ) {
+ $text = $this->interwikiTransclude( $title, 'render' );
+ $isHTML = true;
+ $noparse = true;
} else {
- $articleContent = $this->fetchTemplate( $title );
- if ( $articleContent !== false ) {
- $found = true;
- $text = $articleContent;
- $replaceHeadings = true;
- }
+ $text = $this->interwikiTransclude( $title, 'raw' );
}
- }
-
- # If the title is valid but undisplayable, make a link to it
- if ( $this->mOutputType == OT_HTML && !$found ) {
- $text = '[['.$title->getPrefixedText().']]';
$found = true;
}
-
- # Template cache array insertion
- if( $found ) {
- $this->mTemplates[$part1] = $text;
- $text = $linestart . $text;
- }
}
}
@@ -2714,41 +2719,49 @@
}
/**
- * Translude an interwiki link.
+ * Transclude an interwiki link.
*/
- function scarytransclude($title, $interwiki) {
- global $wgEnableScaryTranscluding;
+ function interwikiTransclude( $title, $action ) {
+ global $wgEnableScaryTranscluding, $wgCanonicalNamespaceNames;
if (!$wgEnableScaryTranscluding)
return wfMsg('scarytranscludedisabled');
- $articlename = "Template:" . $title->getDBkey();
- $url = str_replace('$1', urlencode($articlename), $interwiki);
+ // The namespace will actually only be 0 or 10, depending on whether there was a leading :
+ // But we'll handle it generally anyway
+ if ( $title->getNamespace() ) {
+ // Use the canonical namespace, which should work anywhere
+ $articleName = $wgCanonicalNamespaceNames[$title->getNamespace()] . ':' . $title->getDBkey();
+ } else {
+ $articleName = $title->getDBkey();
+ }
+
+ $url = str_replace('$1', urlencode($articleName), Title::getInterwikiLink($title->getInterwiki()));
+ $url .= "?action=$action";
if (strlen($url) > 255)
return wfMsg('scarytranscludetoolong');
- $text = $this->fetchScaryTemplateMaybeFromCache($url);
- $this->mIWTransData[] = $text;
- return "<!--IW_TRANSCLUDE ".(count($this->mIWTransData) - 1)."-->";
+ return $this->fetchScaryTemplateMaybeFromCache($url);
}
function fetchScaryTemplateMaybeFromCache($url) {
+ global $wgTranscludeCacheExpiry;
$dbr =& wfGetDB(DB_SLAVE);
$obj = $dbr->selectRow('transcache', array('tc_time', 'tc_contents'),
array('tc_url' => $url));
if ($obj) {
$time = $obj->tc_time;
$text = $obj->tc_contents;
- if ($time && $time < (time() + (60*60))) {
+ if ($time && time() < $time + $wgTranscludeCacheExpiry ) {
return $text;
}
}
- $text = wfGetHTTP($url . '?action=render');
+ $text = wfGetHTTP($url);
if (!$text)
return wfMsg('scarytranscludefailed', $url);
$dbw =& wfGetDB(DB_MASTER);
- $dbw->replace('transcache', array(), array(
+ $dbw->replace('transcache', array('tc_url'), array(
'tc_url' => $url,
'tc_time' => time(),
'tc_contents' => $text));
Index: trunk/phase3/includes/RawPage.php
===================================================================
--- trunk/phase3/includes/RawPage.php (revision 12921)
+++ trunk/phase3/includes/RawPage.php (revision 12922)
@@ -83,7 +83,9 @@
} else {
$url = $_SERVER['PHP_SELF'];
}
- if( strcmp( $wgScript, $url ) ) {
+
+ $ua = @$_SERVER['HTTP_USER_AGENT'];
+ if( strcmp( $wgScript, $url ) && strpos( $ua, 'MSIE' ) !== false ) {
# Internet Explorer will ignore the Content-Type header if it
# thinks it sees a file extension it recognizes. Make sure that
# all raw requests are done through the script node, which will
Index: trunk/phase3/includes/DefaultSettings.php
===================================================================
--- trunk/phase3/includes/DefaultSettings.php (revision 12921)
+++ trunk/phase3/includes/DefaultSettings.php (revision 12922)
@@ -1831,6 +1831,10 @@
* Enable interwiki transcluding. Only when iw_trans=1.
*/
$wgEnableScaryTranscluding = false;
+/**
+ * Expiry time for interwiki transclusion
+ */
+$wgTranscludeCacheExpiry = 3600;
/**
* Support blog-style "trackbacks" for articles. See
Index: trunk/phase3/includes/HttpFunctions.php
===================================================================
--- trunk/phase3/includes/HttpFunctions.php (revision 12921)
+++ trunk/phase3/includes/HttpFunctions.php (revision 12922)
@@ -9,20 +9,22 @@
* if $timeout is 'default', $wgHTTPTimeout is used
*/
function wfGetHTTP( $url, $timeout = 'default' ) {
- global $wgHTTPTimeout, $wgHTTPProxy;
+ global $wgHTTPTimeout, $wgHTTPProxy, $wgVersion;
# Use curl if available
if ( function_exists( 'curl_init' ) ) {
$c = curl_init( $url );
if ( wfIsLocalURL( $url ) ) {
curl_setopt( $c, CURLOPT_PROXY, 'localhost:80' );
- } else if ($wgHTTPProxy)
+ } else if ($wgHTTPProxy) {
curl_setopt($c, CURLOPT_PROXY, $wgHTTPProxy);
+ }
if ( $timeout == 'default' ) {
$timeout = $wgHTTPTimeout;
}
curl_setopt( $c, CURLOPT_TIMEOUT, $timeout );
+ curl_setopt( $c, CURLOPT_USERAGENT, "MediaWiki/$wgVersion" );
ob_start();
curl_exec( $c );
$text = ob_get_contents();
