r43639 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r43638‎ | r43639 | r43640 >
Date:21:27, 17 November 2008
Author:siebrand
Status:ok (Comments)
Tags:
Comment:
(bug 44) Rename Image namespace to File. Based on a patch by brion.
* Parser tests updated. 14 failing parser tests before the change, added one, and the same 14 failing parser tests are remaining
* added namespace aliases for Image and Image_talk for backward compatibility purposes
Modified paths:
  • /trunk/extensions/Cite/citeParserTests.txt (modified) (history)
  • /trunk/phase3/RELEASE-NOTES (modified) (history)
  • /trunk/phase3/includes/Namespace.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesEn.php (modified) (history)
  • /trunk/phase3/maintenance/parserTests.txt (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/parserTests.txt
@@ -2335,7 +2335,7 @@
23362336 {{paramtest|
23372337 param =[[Image:noimage.png|thumb|[[no link|link]] [[no link|caption]]]]}}
23382338 !! result
2339 -This is a test template with parameter <div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/index.php?title=Special:Upload&amp;wpDestFile=Noimage.png" class="new" title="Image:Noimage.png">Image:Noimage.png</a> <div class="thumbcaption"><a href="https://www.mediawiki.org/index.php?title=No_link&amp;action=edit&amp;redlink=1" class="new" title="No link (not yet written)">link</a> <a href="https://www.mediawiki.org/index.php?title=No_link&amp;action=edit&amp;redlink=1" class="new" title="No link (not yet written)">caption</a></div></div></div>
 2339+This is a test template with parameter <div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/index.php?title=Special:Upload&amp;wpDestFile=Noimage.png" class="new" title="File:Noimage.png">File:Noimage.png</a> <div class="thumbcaption"><a href="https://www.mediawiki.org/index.php?title=No_link&amp;action=edit&amp;redlink=1" class="new" title="No link (not yet written)">link</a> <a href="https://www.mediawiki.org/index.php?title=No_link&amp;action=edit&amp;redlink=1" class="new" title="No link (not yet written)">caption</a></div></div></div>
23402340
23412341 !! end
23422342
@@ -3072,7 +3072,7 @@
30733073 !! input
30743074 [[Image:foobar.jpg]]
30753075 !! result
3076 -<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="Image:foobar.jpg"><img alt="Image:foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
 3076+<p><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="Image:foobar.jpg"><img alt="Image:foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
30773077 </p>
30783078 !! end
30793079
@@ -3081,16 +3081,25 @@
30823082 !! input
30833083 [[Image:foobar.jpg|right]]
30843084 !! result
3085 -<div class="floatright"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a></div>
 3085+<div class="floatright"><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a></div>
30863086
30873087 !! end
30883088
30893089 !! test
 3090+Simple image (using File: namespace, now canonical)
 3091+!! input
 3092+[[File:foobar.jpg]]
 3093+!! result
 3094+<p><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="File:foobar.jpg"><img alt="File:foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
 3095+</p>
 3096+!! end
 3097+
 3098+!! test
30903099 Image with caption
30913100 !! input
30923101 [[Image:foobar.jpg|right|Caption text]]
30933102 !! result
3094 -<div class="floatright"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="Caption text"><img alt="Caption text" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a></div>
 3103+<div class="floatright"><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="Caption text"><img alt="Caption text" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a></div>
30953104
30963105 !! end
30973106
@@ -3128,7 +3137,7 @@
31293138 !! input
31303139 [[Image:Foobar.jpg|frame|left|This is a test image [[Main Page]]]]
31313140 !! result
3132 -<div class="thumb tleft"><div class="thumbinner" style="width:1943px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="This is a test image Main Page"><img alt="" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" class="thumbimage" /></a> <div class="thumbcaption">This is a test image <a href="https://www.mediawiki.org/wiki/Main_Page" title="Main Page">Main Page</a></div></div></div>
 3141+<div class="thumb tleft"><div class="thumbinner" style="width:1943px;"><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="This is a test image Main Page"><img alt="" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" class="thumbimage" /></a> <div class="thumbcaption">This is a test image <a href="https://www.mediawiki.org/wiki/Main_Page" title="Main Page">Main Page</a></div></div></div>
31333142
31343143 !! end
31353144
@@ -3137,7 +3146,7 @@
31383147 !! input
31393148 [[Image:Foobar.jpg|frame|left|This is a test image [[Main Page]]|alt=Altitude]]
31403149 !! result
3141 -<div class="thumb tleft"><div class="thumbinner" style="width:1943px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="This is a test image Main Page"><img alt="Altitude" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" class="thumbimage" /></a> <div class="thumbcaption">This is a test image <a href="https://www.mediawiki.org/wiki/Main_Page" title="Main Page">Main Page</a></div></div></div>
 3150+<div class="thumb tleft"><div class="thumbinner" style="width:1943px;"><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="This is a test image Main Page"><img alt="Altitude" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" class="thumbimage" /></a> <div class="thumbcaption">This is a test image <a href="https://www.mediawiki.org/wiki/Main_Page" title="Main Page">Main Page</a></div></div></div>
31423151
31433152 !! end
31443153
@@ -3146,7 +3155,7 @@
31473156 !! input
31483157 [[Image:Foobar.jpg|testing '''bold''' in alt]]
31493158 !! result
3150 -<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="testing bold in alt"><img alt="testing bold in alt" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
 3159+<p><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="testing bold in alt"><img alt="testing bold in alt" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
31513160 </p>
31523161 !! end
31533162
@@ -3155,18 +3164,18 @@
31563165 !! input
31573166 [[Image:Foobar.jpg|alt=testing '''bold''' in alt]]
31583167 !! result
3159 -<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="testing bold in alt" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
 3168+<p><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="testing bold in alt" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
31603169 </p>
31613170 !! end
31623171
31633172 !! test
31643173 Link to image page- image page normally doesn't exists, hence edit link
31653174 Add test with existing image page
3166 -#<p><a href="https://www.mediawiki.org/wiki/Image:Test" title="Image:Test">Image:test</a>
 3175+#<p><a href="https://www.mediawiki.org/wiki/File:Test" title="Image:Test">Image:test</a>
31673176 !! input
31683177 [[:Image:test]]
31693178 !! result
3170 -<p><a href="https://www.mediawiki.org/index.php?title=Image:Test&amp;action=edit&amp;redlink=1" class="new" title="Image:Test (not yet written)">Image:test</a>
 3179+<p><a href="https://www.mediawiki.org/index.php?title=File:Test&amp;action=edit&amp;redlink=1" class="new" title="File:Test (not yet written)">Image:test</a>
31713180 </p>
31723181 !! end
31733182
@@ -3175,7 +3184,7 @@
31763185 !! input
31773186 [[Image:foobar.jpg|http://example.com]]
31783187 !! result
3179 -<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="http://example.com"><img alt="http://example.com" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
 3188+<p><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="http://example.com"><img alt="http://example.com" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
31803189 </p>
31813190 !! end
31823191
@@ -3184,7 +3193,7 @@
31853194 !! input
31863195 [[Image:foobar.jpg|thumb|http://example.com]]
31873196 !! result
3188 -<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="http://example.com"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div><a href="http://example.com" class="external free" title="http://example.com" rel="nofollow">http://example.com</a></div></div></div>
 3197+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="http://example.com"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div><a href="http://example.com" class="external free" title="http://example.com" rel="nofollow">http://example.com</a></div></div></div>
31893198
31903199 !! end
31913200
@@ -3193,7 +3202,7 @@
31943203 !! input
31953204 [[Image:foobar.jpg|thumb|http://example.com|alt=Alteration]]
31963205 !! result
3197 -<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="http://example.com"><img alt="Alteration" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div><a href="http://example.com" class="external free" title="http://example.com" rel="nofollow">http://example.com</a></div></div></div>
 3206+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="http://example.com"><img alt="Alteration" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div><a href="http://example.com" class="external free" title="http://example.com" rel="nofollow">http://example.com</a></div></div></div>
31983207
31993208 !! end
32003209
@@ -3202,7 +3211,7 @@
32033212 !! input
32043213 [[Image:foobar.jpg|thumb|ISBN 1235467890]]
32053214 !! result
3206 -<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="ISBN 1235467890"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div><a href="https://www.mediawiki.org/wiki/Special:BookSources/1235467890" class="internal">ISBN 1235467890</a></div></div></div>
 3215+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="ISBN 1235467890"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div><a href="https://www.mediawiki.org/wiki/Special:BookSources/1235467890" class="internal">ISBN 1235467890</a></div></div></div>
32073216
32083217 !! end
32093218
@@ -3211,7 +3220,7 @@
32123221 !! input
32133222 [[Image:foobar.jpg|thumb|This is RFC 12354]]
32143223 !! result
3215 -<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="This is RFC 12354"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>This is <a href="http://tools.ietf.org/html/rfc12354" class="external" title="http://tools.ietf.org/html/rfc12354">RFC 12354</a></div></div></div>
 3224+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="This is RFC 12354"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>This is <a href="http://tools.ietf.org/html/rfc12354" class="external" title="http://tools.ietf.org/html/rfc12354">RFC 12354</a></div></div></div>
32163225
32173226 !! end
32183227
@@ -3220,7 +3229,7 @@
32213230 !! input
32223231 [[Image:foobar.jpg|thumb|Please mailto:nobody@example.com]]
32233232 !! result
3224 -<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="Please mailto:nobody@example.com"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>Please <a href="mailto:nobody@example.com" class="external free" title="mailto:nobody@example.com" rel="nofollow">mailto:nobody@example.com</a></div></div></div>
 3233+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="Please mailto:nobody@example.com"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>Please <a href="mailto:nobody@example.com" class="external free" title="mailto:nobody@example.com" rel="nofollow">mailto:nobody@example.com</a></div></div></div>
32253234
32263235 !! end
32273236
@@ -3230,7 +3239,7 @@
32313240 !! input
32323241 [[Image:foobar.jpg|thumb|<math>2+2</math>]]
32333242 !! result
3234 -<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="&lt;math&gt;2+2&lt;/math&gt;"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>&lt;math&gt;2+2&lt;/math&gt;</div></div></div>
 3243+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="&lt;math&gt;2+2&lt;/math&gt;"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>&lt;math&gt;2+2&lt;/math&gt;</div></div></div>
32353244
32363245 !! end
32373246
@@ -3241,7 +3250,7 @@
32423251 !! input
32433252 [[Image:foobar.jpg|thumb|<math>2+2</math>]]
32443253 !! result
3245 -<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="2 + 2"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div><span class="texhtml">2 + 2</span></div></div></div>
 3254+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="2 + 2"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div><span class="texhtml">2 + 2</span></div></div></div>
32463255
32473256 !! end
32483257
@@ -3251,7 +3260,7 @@
32523261 !! input
32533262 [[Image:foobar.jpg|text with a [[link]] in it]]
32543263 !! result
3255 -<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="text with a link in it"><img alt="text with a link in it" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
 3264+<p><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="text with a link in it"><img alt="text with a link in it" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
32563265 </p>
32573266 !! end
32583267
@@ -3260,7 +3269,7 @@
32613270 !! input
32623271 [[Image:foobar.jpg|text with a [[link]]foo in it]]
32633272 !! result
3264 -<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="text with a linkfoo in it"><img alt="text with a linkfoo in it" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
 3273+<p><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="text with a linkfoo in it"><img alt="text with a linkfoo in it" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
32653274 </p>
32663275 !! end
32673276
@@ -3269,7 +3278,7 @@
32703279 !! input
32713280 [[Image:foobar.jpg|text with a [[MeatBall:Link]] in it]]
32723281 !! result
3273 -<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="text with a MeatBall:Link in it"><img alt="text with a MeatBall:Link in it" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
 3282+<p><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="text with a MeatBall:Link in it"><img alt="text with a MeatBall:Link in it" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
32743283 </p>
32753284 !! end
32763285
@@ -3278,7 +3287,7 @@
32793288 !! input
32803289 [[Image:foobar.jpg|text with a [[MeatBall:Link|link]] in it]]
32813290 !! result
3282 -<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="text with a link in it"><img alt="text with a link in it" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
 3291+<p><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="text with a link in it"><img alt="text with a link in it" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
32833292 </p>
32843293 !! end
32853294
@@ -3287,7 +3296,7 @@
32883297 !! input
32893298 [[Image:foobar.jpg|& < > "]]
32903299 !! result
3291 -<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="&amp; &lt; &gt; &quot;"><img alt="&amp; &lt; &gt; &quot;" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
 3300+<p><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="&amp; &lt; &gt; &quot;"><img alt="&amp; &lt; &gt; &quot;" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
32923301 </p>
32933302 !! end
32943303
@@ -3296,7 +3305,7 @@
32973306 !! input
32983307 [[Image:foobar.jpg|&#9792;]]
32993308 !! result
3300 -<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="♀"><img alt="♀" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
 3309+<p><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="♀"><img alt="♀" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
33013310 </p>
33023311 !! end
33033312
@@ -3314,7 +3323,7 @@
33153324 !! input
33163325 [[Image:Foobar.jpg|thumb|This is a caption with another [[Image:icon.png|image]] inside it!]]
33173326 !! result
3318 -<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="This is a caption with another Image:Icon.png inside it!"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>This is a caption with another <a href="https://www.mediawiki.org/index.php?title=Special:Upload&amp;wpDestFile=Icon.png" class="new" title="Image:Icon.png">Image:Icon.png</a> inside it!</div></div></div>
 3327+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="This is a caption with another File:Icon.png inside it!"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>This is a caption with another <a href="https://www.mediawiki.org/index.php?title=Special:Upload&amp;wpDestFile=Icon.png" class="new" title="File:Icon.png">File:Icon.png</a> inside it!</div></div></div>
33193328
33203329 !! end
33213330
@@ -3324,7 +3333,7 @@
33253334 [[Image:Foobar.jpg|This
33263335 *is some text]]
33273336 !! result
3328 -<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="This *is some text"><img alt="This *is some text" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
 3337+<p><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="This *is some text"><img alt="This *is some text" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
33293338 </p>
33303339 !!end
33313340
@@ -3334,7 +3343,7 @@
33353344 !! input
33363345 [[Image:Foobar.jpg|thumb|200px|This caption has [irc://example.net irc] and [https://example.com Secure] ext links in it.]]
33373346 !! result
3338 -<div class="thumb tright"><div class="thumbinner" style="width:202px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="This caption has irc and Secure ext links in it."><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/200px-Foobar.jpg" width="200" height="23" border="0" class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>This caption has <a href="irc://example.net" class="external text" title="irc://example.net" rel="nofollow">irc</a> and <a href="https://example.com" class="external text" title="https://example.com" rel="nofollow">Secure</a> ext links in it.</div></div></div>
 3347+<div class="thumb tright"><div class="thumbinner" style="width:202px;"><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="This caption has irc and Secure ext links in it."><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/200px-Foobar.jpg" width="200" height="23" border="0" class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>This caption has <a href="irc://example.net" class="external text" title="irc://example.net" rel="nofollow">irc</a> and <a href="https://example.com" class="external text" title="https://example.com" rel="nofollow">Secure</a> ext links in it.</div></div></div>
33393348
33403349 !! end
33413350
@@ -3737,7 +3746,7 @@
37383747 !! input
37393748 http://example.com [[Image:foobar.jpg]]
37403749 !! result
3741 -<p><a href="http://example.com" class="external free" title="http://example.com" rel="nofollow">http://example.com</a> <a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="Image:foobar.jpg"><img alt="Image:foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
 3750+<p><a href="http://example.com" class="external free" title="http://example.com" rel="nofollow">http://example.com</a> <a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="Image:foobar.jpg"><img alt="Image:foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
37423751 </p>
37433752 !!end
37443753
@@ -3746,7 +3755,7 @@
37473756 !! input
37483757 http://example.com[[Image:foobar.jpg]]
37493758 !! result
3750 -<p><a href="http://example.com" class="external free" title="http://example.com" rel="nofollow">http://example.com</a><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="Image:foobar.jpg"><img alt="Image:foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
 3759+<p><a href="http://example.com" class="external free" title="http://example.com" rel="nofollow">http://example.com</a><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="Image:foobar.jpg"><img alt="Image:foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a>
37513760 </p>
37523761 !!end
37533762
@@ -3932,7 +3941,7 @@
39333942 !! input
39343943 [[Image:No such.jpg]]
39353944 !! result
3936 -<p><a href="https://www.mediawiki.org/index.php?title=Special:Upload&amp;wpDestFile=No_such.jpg" class="new" title="Image:No such.jpg">Image:No such.jpg</a>
 3945+<p><a href="https://www.mediawiki.org/index.php?title=Special:Upload&amp;wpDestFile=No_such.jpg" class="new" title="File:No such.jpg">File:No such.jpg</a>
39373946 </p>
39383947 !! end
39393948
@@ -3941,7 +3950,7 @@
39423951 !! input
39433952 [[:Image:No such.jpg]]
39443953 !! result
3945 -<p><a href="https://www.mediawiki.org/index.php?title=Image:No_such.jpg&amp;action=edit&amp;redlink=1" class="new" title="Image:No such.jpg (not yet written)">Image:No such.jpg</a>
 3954+<p><a href="https://www.mediawiki.org/index.php?title=File:No_such.jpg&amp;action=edit&amp;redlink=1" class="new" title="File:No such.jpg (not yet written)">Image:No such.jpg</a>
39463955 </p>
39473956 !! end
39483957
@@ -6254,7 +6263,7 @@
62556264 !! input
62566265 [[Image:foobar.jpg|centre]]
62576266 !! result
6258 -<div class="center"><div class="floatnone"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a></div></div>
 6267+<div class="center"><div class="floatnone"><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a></div></div>
62596268
62606269 !!end
62616270
@@ -6263,7 +6272,7 @@
62646273 !! input
62656274 [[Image:foobar.jpg|none]]
62666275 !! result
6267 -<div class="floatnone"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a></div>
 6276+<div class="floatnone"><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="" src="http://example.com/images/3/3a/Foobar.jpg" width="1941" height="220" border="0" /></a></div>
62686277
62696278 !!end
62706279
@@ -6272,7 +6281,7 @@
62736282 !! input
62746283 [[Image:foobar.jpg|640x480px]]
62756284 !! result
6276 -<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg" width="640" height="73" border="0" /></a>
 6285+<p><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg" width="640" height="73" border="0" /></a>
62776286 </p>
62786287 !!end
62796288
@@ -6281,7 +6290,7 @@
62826291 !! input
62836292 [[Image:foobar.jpg|640px]]
62846293 !! result
6285 -<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg" width="640" height="73" border="0" /></a>
 6294+<p><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg" width="640" height="73" border="0" /></a>
62866295 </p>
62876296 !!end
62886297
@@ -6290,7 +6299,7 @@
62916300 !! input
62926301 [[Image:foobar.jpg|640px ]]
62936302 !! result
6294 -<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg" width="640" height="73" border="0" /></a>
 6303+<p><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg" width="640" height="73" border="0" /></a>
62956304 </p>
62966305 !!end
62976306
@@ -6299,7 +6308,7 @@
63006309 !! input
63016310 [[Image:foobar.jpg| 640px]]
63026311 !! result
6303 -<p><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg" width="640" height="73" border="0" /></a>
 6312+<p><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg" width="640" height="73" border="0" /></a>
63046313 </p>
63056314 !!end
63066315
@@ -6337,7 +6346,7 @@
63386347 !! input
63396348 [[image:Foobar.jpg|thumb|An [http://test/?param1=|left|&param2=|x external] URL]]
63406349 !! result
6341 -<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="An external URL"><img alt="An external URL" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>An <a href="http://test/?param1=|left|&amp;param2=|x" class="external text" title="http://test/?param1=|left|&amp;param2=|x" rel="nofollow">external</a> URL</div></div></div>
 6350+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="An external URL"><img alt="An external URL" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>An <a href="http://test/?param1=|left|&amp;param2=|x" class="external text" title="http://test/?param1=|left|&amp;param2=|x" rel="nofollow">external</a> URL</div></div></div>
63426351
63436352 !!end
63446353
@@ -7151,7 +7160,7 @@
71527161 !! input
71537162 [[Image:Foobar.jpg|thumb|http://x|hello]]
71547163 !! result
7155 -<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="hello"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>hello</div></div></div>
 7164+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="hello"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div>hello</div></div></div>
71567165
71577166 !! end
71587167
Index: trunk/phase3/includes/Namespace.php
@@ -16,8 +16,8 @@
1717 NS_USER_TALK => 'User_talk',
1818 NS_PROJECT => 'Project',
1919 NS_PROJECT_TALK => 'Project_talk',
20 - NS_IMAGE => 'Image',
21 - NS_IMAGE_TALK => 'Image_talk',
 20+ NS_IMAGE => 'File',
 21+ NS_IMAGE_TALK => 'File_talk',
2222 NS_MEDIAWIKI => 'MediaWiki',
2323 NS_MEDIAWIKI_TALK => 'MediaWiki_talk',
2424 NS_TEMPLATE => 'Template',
Index: trunk/phase3/languages/messages/MessagesEn.php
@@ -86,8 +86,8 @@
8787 NS_USER_TALK => 'User_talk',
8888 # NS_PROJECT set by $wgMetaNamespace
8989 NS_PROJECT_TALK => '$1_talk',
90 - NS_IMAGE => 'Image',
91 - NS_IMAGE_TALK => 'Image_talk',
 90+ NS_IMAGE => 'File',
 91+ NS_IMAGE_TALK => 'File_talk',
9292 NS_MEDIAWIKI => 'MediaWiki',
9393 NS_MEDIAWIKI_TALK => 'MediaWiki_talk',
9494 NS_TEMPLATE => 'Template',
@@ -101,7 +101,10 @@
102102 /**
103103 * Array of namespace aliases, mapping from name to NS_xxx index
104104 */
105 -$namespaceAliases = array();
 105+$namespaceAliases = array(
 106+ 'Image' => NS_IMAGE,
 107+ 'Image_talk' => NS_IMAGE_TALK,
 108+);
106109
107110 /**
108111 * Skin names. If any key is not specified, the English one will be used.
Index: trunk/phase3/RELEASE-NOTES
@@ -60,6 +60,9 @@
6161 on the user's real name if one is set. Defaults to false (use the username)
6262 * Removed the 'apiThumbCacheDir' option from $wgForeignFileRepos (only used in
6363 ForeignAPIRepo)
 64+* Image namespace and accompanying talk namespace renamed to File. For backward
 65+ compatibility purposes, Image still works. External tools may need to be
 66+ updated.
6467
6568 === Migrated extensions ===
6669 The following extensions are migrated into MediaWiki 1.14:
@@ -197,8 +200,8 @@
198201 * (bug 16113) Show/hide for redirects in Special:NewPages
199202 * (bug 15903) Upload link was added to Nostalgia skin
200203 * (bug 15761) Add user toggle to omit diff after rollback
201 -* Added the BitmapHandler_ClientOnly media handler, which allows server-side
202 - image scaling to be completely disabled for specific media types, via the
 204+* Added the BitmapHandler_ClientOnly media handler, which allows server-side
 205+ image scaling to be completely disabled for specific media types, via the
203206 $wgMediaHandlers configuration variable.
204207 * New 'AbortDiffCache' hook can be used to cancel the caching of a diff
205208 * (bug 15835) Added Content-Style-Type meta tag
@@ -336,11 +339,11 @@
337340 search box
338341 * (bug 4362) [[MediaWiki:History copyright]] no more used with most recent
339342 revision when passing oldid parameter in the url
340 -* (bug 16265) When caching thumbs with the ForeignApiRepo, we now use the same
 343+* (bug 16265) When caching thumbs with the ForeignApiRepo, we now use the same
341344 filename as the remote site.
342345 * (bug 8345) Don't autosummarize where a redirect was left unchanged
343346 * Made thumb caching in ForeignApiFile objects integrated with normal thumb
344 - path naming (/thumbs/hash/file), retired 'apiThumbCacheDir' as a result.
 347+ path naming (/thumbs/hash/file), retired 'apiThumbCacheDir' as a result.
345348 * (bug 5530) Consistency between character encoding in {{PAGENAMEE}},
346349 {{SUBPAGENAMEE}} and {{FULLPAGENAMEE}}
347350 * API siteinfo query no longer throws an exception for empty sifilter parameter.
Index: trunk/extensions/Cite/citeParserTests.txt
@@ -112,7 +112,7 @@
113113 <table class="gallery" cellspacing="0" cellpadding="0">
114114 <tr>
115115 <td><div class="gallerybox" style="width: 155px;">
116 - <div class="thumb" style="padding: 66px 0; width: 150px;"><div style="margin-left: auto; margin-right: auto; width: 120px;"><a href="https://www.mediawiki.org/wiki/Image:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg" width="120" height="14" border="0" /></a></div></div>
 116+ <div class="thumb" style="padding: 66px 0; width: 150px;"><div style="margin-left: auto; margin-right: auto; width: 120px;"><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image" title="Foobar.jpg"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg" width="120" height="14" border="0" /></a></div></div>
117117 <div class="gallerytext">
118118 </div>
119119 </div></td>

Follow-up revisions

RevisionCommit summaryAuthorDate
r43806Revert r43785 (switching hardcoded Image: to loading the canonical name). Thi...demon09:24, 21 November 2008
r44001(bug 44) make 'Image' and 'Image_talk' compatibility aliases work for all lan...vyznev20:27, 27 November 2008
r44004First step in replacing NS_IMAGE with NS_FILE, to match the canonical name ch...vyznev22:36, 27 November 2008
r44121Step 2 in NS_IMAGE -> NS_FILE transition (bug 44) (WARNING: huge commit)....vyznev17:14, 1 December 2008
r44122bug 44 related change: NS_IMAGE -> NS_FILEsiebrand18:03, 1 December 2008
r44495(bug 44) Fix omission: Image -> File in namespace names for yue, zh-hans, and...siebrand11:11, 12 December 2008
r44508Manual exporting namespaces aliases from Betawiki (bug 44: renaming of Image ...ialex18:21, 12 December 2008

Comments

#Comment by Brion VIBBER (talk | contribs)   23:28, 21 November 2008

woohoo

Status & tagging log