tc_url -> varchar, limit url length

diff --git a/includes/Parser.php b/includes/Parser.php
index 43db09a..599c104 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -2357,6 +2357,8 @@ class Parser
 
                $articlename = "Template:" . $title->getDBkey();
                $url = str_replace('$1', urlencode($articlename), $interwiki);
+               if (strlen($url) > 255)
+                       return wfMsg('scarytranscludetoolong');
                $text = $this->fetchScaryTemplateMaybeFromCache($url);
                $this->mIWTransData[] = $text;
                return "<!--IW_TRANSCLUDE ".(count($this->mIWTransData) - 1)."-->";

diff --git a/languages/Language.php b/languages/Language.php
index 1cde939..d4bc01b 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -2122,6 +2122,7 @@ will expire at $4.
 # Scary transclusion
 'scarytranscludedisabled' => '[Interwiki transcluding is disabled]',
 'scarytranscludefailed' => '[Template fetch failed; sorry]',
+'scarytranscludetoolong' => '[URL is too long; sorry]',
 
 );
 

diff --git a/maintenance/archives/patch-transcache.sql b/maintenance/archives/patch-transcache.sql
index fcc1ada..2bdc10c 100644 (file)
--- a/maintenance/archives/patch-transcache.sql
+++ b/maintenance/archives/patch-transcache.sql
@@ -1,7 +1,7 @@
 CREATE TABLE /*$wgDBprefix*/transcache (
-       tc_url          TEXT NOT NULL, 
-       tc_contents     TEXT, 
-       tc_time         INT NOT NULL, 
-       UNIQUE INDEX tc_url_idx(tc_url(512))
+       tc_url          VARCHAR(255) NOT NULL,
+       tc_contents     TEXT,
+       tc_time         INT NOT NULL,
+       UNIQUE INDEX tc_url_idx(tc_url)
 );