-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
We're a bit behind on code review, so I've gone ahead and de-merged this
branch merge for the moment. Sorry. :)
Once we're caught up we can review that and bring it back in... might be
best to wait until after 1.10 branch since that's coming up in two weeks.
- -- brion vibber (brion @ pobox.com / brion @ wikimedia.org)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFF+sIVwRnhpk1wk44RAsMgAJ9xGn4s6pLFC61QsiIjKURt21uOxQCdEXeO
FGAI74U5RZEfO2deFnQRZfE=
=k5H1
-----END PGP SIGNATURE-----
The inclusion of MediaWiki:<meta> pages in the base Article, templates,
etc. dumps, such as the English Wikipedia, cause major
problems if you are trying to import these dumps into a Wikipedia
enabled for another language. Many of the navigation menu's
get trashed and corrupted when these MediaWiki labels for the English
Wikipedia are included in the base article and template dumps.
It certainly is ok to include them in the dumps which supposedly
contains "everything" (the .7z dumps) but they shoud be stripped out
of the base dumps which are supposed to just contain the articles and
templates for the articles.
If you import one of these dumps without stipping out the MediaWiki:
specific articles which add menu items, etc. the navigation bar gets
messed up and things likfe "Recent Changes" no longer map properly in
MedaiWiki.
I think its OK to leave some of the MediaWiki tags, like site notice and
"contribute to Wikipedia" kind of stuff for GFDL and attribution,
but the inclusion of menu pointers which affect menus should be stripped
out as they will cause major problems on MediaWiki's enabled
for another language.
Jeff
An automated run of parserTests.php showed the following failures:
This is MediaWiki version 1.10alpha (r20533).
Reading tests from "maintenance/parserTests.txt"...
Reading tests from "extensions/Cite/citeParserTests.txt"...
Reading tests from "extensions/Poem/poemParserTests.txt"...
3 previously PASSING test(s) removed o_O
* Link to image page- image page normally doesn't exists, hence edit link
TODO: Add test with existing image page
#<p><a href="/wiki/Image:Test" title="Image:Test">Image:test</a> [First recorded appearance: 11-Nov-2006 12:40:23, 1.9alpha (r17532)]
* TODO: Parsing optional HTML elements (Bug 6171) [First recorded appearance: 11-Nov-2006 12:40:23, 1.9alpha (r17532)]
* TODO: Don't fall for the self-closing div [First recorded appearance: 15-Nov-2006 08:15:56, 1.9alpha (r17697)]
3 new PASSING test(s) :)
* Link to image page- image page normally doesn't exists, hence edit link
Add test with existing image page
#<p><a href="/wiki/Image:Test" title="Image:Test">Image:test</a> [Has never failed]
* Parsing optional HTML elements (Bug 6171) [Has never failed]
* Don't fall for the self-closing div [Has never failed]
14 previously FAILING test(s) removed O_o
* TODO: Table security: embedded pipes (http://mail.wikipedia.org/pipermail/wikitech-l/2006-April/034637.html) [First recorded appearance: 11-Nov-2006 12:40:23, 1.9alpha (r17532)]
* TODO: Link containing double-single-quotes '' (bug 4598) [First recorded appearance: 11-Nov-2006 12:40:23, 1.9alpha (r17532)]
* TODO: message transform: <noinclude> in transcluded template (bug 4926) [First recorded appearance: 11-Nov-2006 12:40:23, 1.9alpha (r17532)]
* TODO: message transform: <onlyinclude> in transcluded template (bug 4926) [First recorded appearance: 11-Nov-2006 12:40:23, 1.9alpha (r17532)]
* TODO: HTML bullet list, unclosed tags (bug 5497) [First recorded appearance: 11-Nov-2006 12:40:23, 1.9alpha (r17532)]
* TODO: HTML ordered list, unclosed tags (bug 5497) [First recorded appearance: 11-Nov-2006 12:40:23, 1.9alpha (r17532)]
* TODO: HTML nested bullet list, open tags (bug 5497) [First recorded appearance: 11-Nov-2006 12:40:23, 1.9alpha (r17532)]
* TODO: HTML nested ordered list, open tags (bug 5497) [First recorded appearance: 11-Nov-2006 12:40:23, 1.9alpha (r17532)]
* TODO: Inline HTML vs wiki block nesting [First recorded appearance: 11-Nov-2006 12:40:23, 1.9alpha (r17532)]
* TODO: Mixing markup for italics and bold [First recorded appearance: 11-Nov-2006 12:40:23, 1.9alpha (r17532)]
* TODO: dt/dd/dl test [First recorded appearance: 11-Nov-2006 12:40:23, 1.9alpha (r17532)]
* TODO: Images with the "|" character in the comment [First recorded appearance: 14-Nov-2006 08:15:48, 1.9alpha (r17662)]
* TODO: Parents of subpages, two levels up, without trailing slash or name. [First recorded appearance: 15-Nov-2006 08:15:56, 1.9alpha (r17697)]
* TODO: Parents of subpages, two levels up, with lots of extra trailing slashes. [First recorded appearance: 15-Nov-2006 08:15:56, 1.9alpha (r17697)]
14 new FAILING test(s) :(
* Table security: embedded pipes (http://mail.wikipedia.org/pipermail/wikitech-l/2006-April/034637.html) [Has never passed]
* Link containing double-single-quotes '' (bug 4598) [Has never passed]
* message transform: <noinclude> in transcluded template (bug 4926) [Has never passed]
* message transform: <onlyinclude> in transcluded template (bug 4926) [Has never passed]
* HTML bullet list, unclosed tags (bug 5497) [Has never passed]
* HTML ordered list, unclosed tags (bug 5497) [Has never passed]
* HTML nested bullet list, open tags (bug 5497) [Has never passed]
* HTML nested ordered list, open tags (bug 5497) [Has never passed]
* Inline HTML vs wiki block nesting [Has never passed]
* Mixing markup for italics and bold [Has never passed]
* dt/dd/dl test [Has never passed]
* Images with the "|" character in the comment [Has never passed]
* Parents of subpages, two levels up, without trailing slash or name. [Has never passed]
* Parents of subpages, two levels up, with lots of extra trailing slashes. [Has never passed]
3 still FAILING test(s) :(
* URL-encoding in URL functions (single parameter) [Has never passed]
* URL-encoding in URL functions (multiple parameters) [Has never passed]
* BUG 1887, part 2: A <math> with a thumbnail- math enabled [Has never passed]
Passed 494 of 511 tests (96.67%)... 17 tests failed!
Just curious about ways to maybe save bandwidth for little mediawiki
installations as well as wikipedia:
Have the logos at the bottom of the screen, background images use the
central wikimedia ones ("hotlinked") instead of the ones that come
from the distribution .tar. And on the central wikimedia ones, have
Expires: Jan 1 2036 etc. HTTP header. Result: one copy cached forever
on the whole Internet? If one day regret Expires 2036, then just
change the filename when needed. Or maybe expires 1 year form now,
etc.
Maybe also somewhat for .css.
Gentlemen, what do you think of my single MediaWiki file tree for both
my wikis, which must not only work on localhost, but on the production
server too,
drwxr-xr-x 16 1024 2007-03-06 04:22 mediawiki
lrwxrwxrwx 1 17 2007-03-06 04:22 radioscanningtw.jidanni.org -> mediawiki
lrwxrwxrwx 1 17 2007-03-06 04:23 taizhongbus.jidanni.org -> mediawiki
$ cat mediawiki/LocalSettings.php
...
#combined taizhongbus and radioscanningtw LocalSettings.php
$jidanni_R='radioscanningtw.jidanni.org';
$jidanni_T='taizhongbus.jidanni.org';
#So works with web pages and maintenance scripts:
$jidanni_haystack=$_SERVER['SCRIPT_FILENAME'].$_SERVER['PWD'];
if(strpos($jidanni_haystack, $jidanni_R)){
$wgScriptPath="/$jidanni_R";
$wgSitename='台掃';
$wgLogo="$wgScriptPath/skins/common/images/ar-3000a.png";
$wgProxyKey=...
$wgDBname=...
}elseif(strpos($jidanni_haystack, $jidanni_T)){
$wgScriptPath="/$jidanni_T";
$wgSitename='中公';
$wgLogo="$wgScriptPath/skins/common/images/tzbus.png";
$wgProxyKey=...
$wgDBname=...
}else{
trigger_error(" Website broken again,
please telephone me, (04)25854780. --- Wrong \$jidanni_haystack:
\"$jidanni_haystack\"", E_USER_ERROR);
}
...
switch ($wgServerName){
case 'localhost':
$wgDBserver='localhost';
$wgDBuser=...
$wgDBpassword=...
$wgDBprefix=...
break;
default:
$wgDBserver="mysql.$wgServerName";
$wgDBuser=...
$wgDBpassword=...
$wgDBprefix=...
break;
}
Similarly in AdminSettings.php.
So what do you think? Asking for trouble? Will be sorry later? Heading
for a fall?
Hi core developers...,
Looking at method preload (Article.php) you can see that <includeonly> tags will be swept.
Is it by mischance or by consciously decision that <noinclude>...</noinclude> parts remain?
Since we do not want to hack the original source code and hooks are not provided her - so:
Would it be reasonable to add this
$text = preg_replace( '/<noinclude>.*?<\/noinclude>/s', '', $text );
into the main source code branch?
Greetings.
--
Uwe (Baumbach)
U.Baumbach(a)web.de
_____________________________________________________________________
Der WEB.DE SmartSurfer hilft bis zu 70% Ihrer Onlinekosten zu sparen!
http://smartsurfer.web.de/?mc=100071&distributionid=000000000066
Brion,
> Uwe Baumbach wrote:
>> > Looking at method preload (Article.php) you can see that
>> > <includeonly> tags will be swept.
>
> There is no "preload" method in Article.php.
You are right, sure.
> Do you mean getPreloadedText() in EditPage?
Yes.
>> > Is it by mischance or by consciously decision that
>> > <noinclude>...</noinclude> parts remain?
>
> Sounds normal to me; you either keep the parts for includes or the parts
> that aren't for includes.
>
> <includeonly> -> when not including, remove this
> <onlyinclude> -> when including, remove anything outside this
Where is the code doing even this?
> <noinclude> -> when including, remove this
And that?
> However the code that's there doesn't make sense to me; it appears to be
> removing only the actual <includeonly> and </includeonly> start and end
> tags, not their content.
That´s right.
And makes sense - after all: preloading is for me: including.
So it removes <includeonly> tags (correct!) leaves the content
(correct!) but this only (in my understanding) the half of work.
So:
>> > Would it be reasonable to add this
>> > $text =
>> > preg_replace('/<noinclude>.*?<\/noinclude>/s', '', $text );
>> > into the main source code branch?
In my installation it works - removes opening and closing tags and text
between them.
> Wouldn't that lead to a confusing mix of both?
Can´t see this.
Your view is much better then mine
;-)
The only crucial thing I can imagine is article import.
Don´t know whether preloading is used there.
We need it for the useful extension InputBox (Eric Moeller) that calls
preload feature for a new created article.
With this extension we can avoid to explain new users what a template
is and how {{subst:...}} works and so on. Our clientele is by the
majority older and less skilled...
--
Uwe (Baumbach)
U.Baumbach(a)web.de
An automated run of parserTests.php showed the following failures:
This is MediaWiki version 1.10alpha (r20480).
Reading tests from "maintenance/parserTests.txt"...
Reading tests from "extensions/Cite/citeParserTests.txt"...
Reading tests from "extensions/Poem/poemParserTests.txt"...
17 still FAILING test(s) :(
* URL-encoding in URL functions (single parameter) [Has never passed]
* URL-encoding in URL functions (multiple parameters) [Has never passed]
* TODO: Table security: embedded pipes (http://mail.wikipedia.org/pipermail/wikitech-l/2006-April/034637.html) [Has never passed]
* TODO: Link containing double-single-quotes '' (bug 4598) [Has never passed]
* TODO: message transform: <noinclude> in transcluded template (bug 4926) [Has never passed]
* TODO: message transform: <onlyinclude> in transcluded template (bug 4926) [Has never passed]
* BUG 1887, part 2: A <math> with a thumbnail- math enabled [Has never passed]
* TODO: HTML bullet list, unclosed tags (bug 5497) [Has never passed]
* TODO: HTML ordered list, unclosed tags (bug 5497) [Has never passed]
* TODO: HTML nested bullet list, open tags (bug 5497) [Has never passed]
* TODO: HTML nested ordered list, open tags (bug 5497) [Has never passed]
* TODO: Inline HTML vs wiki block nesting [Has never passed]
* TODO: Mixing markup for italics and bold [Has never passed]
* TODO: dt/dd/dl test [Has never passed]
* TODO: Images with the "|" character in the comment [Has never passed]
* TODO: Parents of subpages, two levels up, without trailing slash or name. [Has never passed]
* TODO: Parents of subpages, two levels up, with lots of extra trailing slashes. [Has never passed]
Passed 494 of 511 tests (96.67%)... 17 tests failed!