From 7ba0982ad33cafbf7b600aa3c70f7bae750c6797 Mon Sep 17 00:00:00 2001 From: Bogdan Stancescu Date: Sat, 6 Dec 2003 01:41:48 +0000 Subject: [PATCH 01/16] Duh! wgMagicWordsEn => wgMagicWordsRo, as it should have been (I guess?) --- languages/LanguageRo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/languages/LanguageRo.php b/languages/LanguageRo.php index 02fdccf3f4..00bbbbdc04 100644 --- a/languages/LanguageRo.php +++ b/languages/LanguageRo.php @@ -91,7 +91,7 @@ include_once("LanguageUtf8.php"); "Sep", "Oct", "Noi", "Dec" ); -/* private */ $wgMagicWordsEn = array( +/* private */ $wgMagicWordsRo = array( # ID CASE SYNONYMS MAG_REDIRECT => array( 0, "#redirect" ), MAG_NOTOC => array( 0, "__FARACUPRINS__" ), -- 2.20.1 From c83ea550e30a5dacd45fdec190a5d721eacb5c3d Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Sat, 6 Dec 2003 02:09:48 +0000 Subject: [PATCH 02/16] MediaWiki: namespace memcached synchronisation --- includes/Article.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/includes/Article.php b/includes/Article.php index 4bc527bc1c..84bbdad376 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -1080,7 +1080,14 @@ class Article { if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { $messageCache = $wgMemc->get( "$wgDBname:messages" ); - if (!$messageCache) { + + # If another thread is loading, poll + for ( $i=0; $i<70 && $messageCache == 'loading'; $i++ ) { + sleep(1); + $messageCache = $wgMemc->get( "$wgDBname:messages" ); + } + + if ( !$messageCache || $messageCache == 'loading' ) { $messageCache = wfLoadAllMessages(); } $messageCache[$this->mTitle->getDBkey()] = $text; @@ -1172,6 +1179,14 @@ class Article { $mw =& MagicWord::get( MAG_SUBST ); $text = $mw->substituteCallback( $text, "wfReplaceSubstVar" ); +/* Experimental: + # Trim trailing whitespace + # MAG_END (__END__) tag allows for trailing + # whitespace to be deliberately included + $text = rtrim( $text ); + $mw =& MagicWord::get( MAG_END ); + $mw->matchAndRemove( $text ); +*/ return $text; } -- 2.20.1 From 44623128ac8687ad93ea39fe2b093c5d622cc097 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Sat, 6 Dec 2003 02:53:12 +0000 Subject: [PATCH 03/16] Add missing getMagicWords() --- languages/LanguageRo.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/languages/LanguageRo.php b/languages/LanguageRo.php index 00bbbbdc04..b9e298fde1 100644 --- a/languages/LanguageRo.php +++ b/languages/LanguageRo.php @@ -1107,6 +1107,12 @@ class LanguageRo extends LanguageUtf8 { function fallback8bitEncoding() { return "iso8859-2"; } + + function getMagicWords() + { + global $wgMagicWordsRo; + return $wgMagicWordsRo; + } } ?> -- 2.20.1 From 0afe103e35a85e65041dbe793a63aadc26bb2e33 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Sat, 6 Dec 2003 04:27:16 +0000 Subject: [PATCH 04/16] Complain if use asks for page that's not archived --- includes/SpecialUndelete.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/includes/SpecialUndelete.php b/includes/SpecialUndelete.php index 3fda4d3017..bfd0e54980 100644 --- a/includes/SpecialUndelete.php +++ b/includes/SpecialUndelete.php @@ -64,6 +64,17 @@ function wfSpecialUndelete( $par ) $sk = $wgUser->getSkin(); $wgOut->setPagetitle( wfMsg( "undeletepage" ) ); + + $sql = "SELECT ar_minor_edit,ar_timestamp,ar_user,ar_user_text,ar_comment + FROM archive WHERE ar_namespace={$namespace} AND ar_title=\"{$title}\" + ORDER BY ar_timestamp DESC"; + $ret = wfQuery( $sql, DB_READ ); + + if( wfNumRows( $ret ) == 0 ) { + $wgOut->addWikiText( wfMsg( "nohistory" ) ); + return 0; + } + $wgOut->addWikiText( wfMsg( "undeletehistory" ) . "\n
\n" . $row->ar_text ); $action = wfLocalUrlE( $wgLang->specialPage( "Undelete" ), "action=submit" ); @@ -80,11 +91,6 @@ function wfSpecialUndelete( $par ) $wgOut->addWikiText( $m[1] ); } - $sql = "SELECT ar_minor_edit,ar_timestamp,ar_user,ar_user_text,ar_comment - FROM archive WHERE ar_namespace={$namespace} AND ar_title=\"{$title}\" - ORDER BY ar_timestamp DESC"; - $ret = wfQuery( $sql, DB_READ ); - $special = $wgLang->getNsText( Namespace::getSpecial() ); $wgOut->addHTML("
    "); while( $row = wfFetchObject( $ret ) ) { -- 2.20.1 From 6b5b2e8785aa093e52fc1f7e905545621279bfc1 Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Sat, 6 Dec 2003 05:50:24 +0000 Subject: [PATCH 05/16] case insensitive MSG, MSGNW and SUBST --- languages/Language.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/languages/Language.php b/languages/Language.php index 4fa89a8822..6b8aaeaea2 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -19,6 +19,7 @@ define("MAG_MSG", 11); define("MAG_SUBST", 12); define("MAG_MSGNW", 13); define("MAG_NOEDITSECTION", 14); +define("MAG_END", 15); #-------------------------------------------------------------------------- # Language-specific text @@ -291,9 +292,10 @@ this (alternative: like this?).", MAG_CURRENTTIME => array( 1, "{{CURRENTTIME}}" ), MAG_NUMBEROFARTICLES => array( 1, "{{NUMBEROFARTICLES}}" ), MAG_CURRENTMONTHNAMEGEN => array( 1, "{{CURRENTMONTHNAMEGEN}}"), - MAG_MSG => array( 1, "{{MSG:$1}}" ), - MAG_SUBST => array( 1, "{{SUBST:$1}}" ), - MAG_MSGNW => array( 1, "{{MSGNW:$1}}" ) + MAG_MSG => array( 0, "{{MSG:$1}}" ), + MAG_SUBST => array( 0, "{{SUBST:$1}}" ), + MAG_MSGNW => array( 0, "{{MSGNW:$1}}" ), + MAG_END => array( 0, "__END__" ) ); # All special pages have to be listed here: a description of "" -- 2.20.1 From af0ecb6b292e92c8fd6a879f571347e273c7ce82 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Sun, 7 Dec 2003 01:59:32 +0000 Subject: [PATCH 06/16] Fix namespace bug resulting in serious data corruption; dump an obsolete global, fix display of complaint message --- maintenance/rebuildlinks.inc | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/maintenance/rebuildlinks.inc b/maintenance/rebuildlinks.inc index 7db35a284f..cf532cc946 100644 --- a/maintenance/rebuildlinks.inc +++ b/maintenance/rebuildlinks.inc @@ -5,9 +5,6 @@ # See rebuildlinks.php, for example. # -# Turn this on if you've got memory to burn -$wgUseMemoryTables = false; - # Buffer this many rows before inserting them all in one sweep. More # than about 1000 will probably not increase speed significantly on # most setups. @@ -16,7 +13,7 @@ $wgUseMemoryTables = false; function rebuildLinkTables() { error_reporting (E_ALL); - global $wgLang, $wgUseMemoryTables, $wgLinkCache, $rowbuf_size; + global $wgLang, $wgLinkCache, $rowbuf_size; print "This script may take several hours to complete. If you abort during that time,\n"; print "your wiki will be in an inconsistent state. If you are going to abort, this is\n"; @@ -123,7 +120,7 @@ function rebuildLinkTables() } else { $nt = Title::newFromText( $link ); if (! $nt) { - print "\nInvalid link in page '$ns:{$from_full_title}': '$link'\n"; + print "\nInvalid link in page '{$from_full_title}': '$link'\n"; continue; } @@ -148,7 +145,7 @@ function rebuildLinkTables() $nt->mArticleID = 0; // assume broken link until proven otherwise $pos = array_push($titles_needing_curdata, $nt) - 1; - $titles_needing_curdata_pos[$nt->getDBkey()] = $pos; + $titles_needing_curdata_pos[$nt->getDBkey() . $nt->getNamespace()] = $pos; $links_corresponding_to_titles[] = $link; unset( $link ); // useless outside this loop, but tempting } @@ -161,10 +158,10 @@ function rebuildLinkTables() $parts[] = " (cur_namespace = " . $nt->getNamespace() . " AND " . "cur_title='" . wfStrencode( $nt->getDBkey() ) . "')"; } - $sql = "SELECT cur_title, cur_id FROM cur WHERE " . implode(" OR ", $parts); + $sql = "SELECT cur_namespace, cur_title, cur_id FROM cur WHERE " . implode(" OR ", $parts); $res = wfQuery( $sql, DB_WRITE ); while($row = wfFetchObject( $res ) ){ - $pos = $titles_needing_curdata_pos[$row->cur_title]; + $pos = $titles_needing_curdata_pos[$row->cur_title . $row->cur_namespace]; $titles_needing_curdata[$pos]->mArticleID = intval($row->cur_id); } for( $k = 0; $k < count( $titles_needing_curdata ) ; $k++) { -- 2.20.1 From 98e99ce5fb8e810847c6d16a621d7e6e5f595017 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 8 Dec 2003 04:28:10 +0000 Subject: [PATCH 07/16] #855829; El's patch to reduce breakage of ,,
     tags where the placeholders are duplicated in other
 parsing steps

---
 includes/OutputPage.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 6ff2cc2fd2..e7df1a236f 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -137,7 +137,7 @@ class OutputPage {
 				$q = preg_split( "/<\\/\\s*nowiki\\s*>/i", $p[1], 2 );
 				++$nwsecs;
 				$nwlist[$nwsecs] = wfEscapeHTMLTagsOnly($q[0]);
-				$stripped .= $unique;
+				$stripped .= $unique . $nwsecs . "s";
 				$text = $q[1];
 			}
 		}
@@ -151,7 +151,7 @@ class OutputPage {
 					$q = preg_split( "/<\\/\\s*math\\s*>/i", $p[1], 2 );
 					++$mathsecs;
 					$mathlist[$mathsecs] = renderMath($q[0]);
-					$stripped2 .= $unique2;
+					$stripped2 .= $unique2 . $mathsecs . "s";
 					$stripped = $q[1];
 				}
 			}
@@ -167,7 +167,7 @@ class OutputPage {
 				$q = preg_split( "/<\\/\\s*pre\\s*>/i", $p[1], 2 );
 				++$presecs;
 				$prelist[$presecs] = "
    ". wfEscapeHTMLTagsOnly($q[0]). "
    ";
-				$stripped3 .= $unique3;
+				$stripped3 .= $unique3 . $presecs . "s";
 				$stripped2 = $q[1];
 			}
 		}
@@ -177,18 +177,18 @@ class OutputPage {
 		$specialChars = array("\\", "$");
 		$escapedChars = array("\\\\", "\\$");
 		for ( $i = 1; $i <= $presecs; ++$i ) {
-			$text = preg_replace( "/{$unique3}/", str_replace( $specialChars, 
-				$escapedChars, $prelist[$i] ), $text, 1 );
+			$text = preg_replace( "/{$unique3}{$i}s/", str_replace( $specialChars, 
+				$escapedChars, $prelist[$i] ), $text );
 		}
 
 		for ( $i = 1; $i <= $mathsecs; ++$i ) {
-			$text = preg_replace( "/{$unique2}/", str_replace( $specialChars, 
-				$escapedChars, $mathlist[$i] ), $text, 1 );
+			$text = preg_replace( "/{$unique2}{$i}s/", str_replace( $specialChars, 
+				$escapedChars, $mathlist[$i] ), $text );
 		}
 
 		for ( $i = 1; $i <= $nwsecs; ++$i ) {
-			$text = preg_replace( "/{$unique}/", str_replace( $specialChars, 
-				$escapedChars, $nwlist[$i] ), $text, 1 );
+			$text = preg_replace( "/{$unique}{$i}s/", str_replace( $specialChars, 
+				$escapedChars, $nwlist[$i] ), $text );
 		}
 		$this->addHTML( $text );
 		wfProfileOut( $fname );
-- 
2.20.1


From a78049116adbdc3c1aad9564308b69f347843c17 Mon Sep 17 00:00:00 2001
From: Brion Vibber 
Date: Mon, 8 Dec 2003 07:10:21 +0000
Subject: [PATCH 08/16] Import release notes from stable

---
 RELEASE-NOTES | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 163 insertions(+)
 create mode 100644 RELEASE-NOTES

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
new file mode 100644
index 0000000000..20e8075b99
--- /dev/null
+++ b/RELEASE-NOTES
@@ -0,0 +1,163 @@
+= MediaWiki release notes =
+
+Stable branch snapshot, release 2003-11-18. This is the version of MediaWiki
+that we're running on Wikipedia as of this date.
+
+== Overview of changes from mediawiki-20031117 release: ==
+
+* Image deletion fixed.
+* Deletion of image old revisions now restricted to sysops
+  (this is an irreversible action and not well logged)
+* Fixed maintenance scripts broken by last release's security fix
+* Many errors in rebuildlinks script fixed.
+
+== Overview of changes from mediawiki-20031107 release: ==
+
+* SECURITY FIX: stricter checking of include path
+* Fixed user contributions next/prev bug
+* Login cookies now have the database name prefixed to allow wikis
+  to coexist in the same domain. This will invalidate any old saved
+  password cookies.
+* Update cache timestamp when talk pages are created
+* Saving the login form in Mozilla no longer blanks password in prefs.
+* Check existence of source page before performing a move.
+* Detect invalid titles in Special:Allpages
+* Q-encode headers on outgoing inter-user e-mail
+* Updates to some translations.
+* Added table of contents border/bg to Cologne Blue, Nostalgia skins
+* Protected pages no longer appear unprotected when visited via redirect
+* Swapped old Wikipedia logo for the MediaWiki sunflower logo
+* install.php, update.php print warning on old PHP versions,
+  added compatibility functions that might or might not help
+
+No database changes since 20031107; upgrading should be clean.
+
+
+== Overview of changes from mediawiki-20030829 release: ==
+
+* Fixed various bugs!
+* Some speed improvements from tweaks to the table indexes
+* Limited support for memcached (see below)
+* New translations (see below)
+* Interwiki link data now kept in database for flexibility
+* Friendlier read-only source view if asked to edit a page when
+  the db is locked or the page is protected.
+* Normal IP blocks auto-expire after 24 hours
+* Optional support for blocking usernames
+* Uploads disabled by default (see below)
+
+
+== Security note ==
+
+Uploads are now disabled by default. If you've set up a secure configuration
+you can reenable uploads by putting:
+
+  $wgDisableUploads = false;
+
+into LocalSettings.php.
+
+Earlier versions of MediaWiki included a bug that potentially allows logged-
+in users to delete arbitrary files in directories writable by the web server
+user by manually feeding false form data; this is now fixed.
+
+As a reminder, disable PHP script execution in the upload directory!
+You may also wish to serve HTML pages as plaintext to prevent cookie-
+stealing JavaScript attacks. Example Apache config fragment:
+
+  
+     # Ignore .htaccess files
+     AllowOverride None
+     
+     # Serve HTML as plaintext
+     AddType text/plain .html .htm .shtml
+     
+     # Don't run arbitrary PHP code.
+     php_admin_flag engine off
+     
+     # If you've other scripting languages, disable them too.
+  
+
+
+== Database updates ==
+
+If you're using update.php, the necessary database changes should
+be made automatically.
+
+To manually upgrade your database from the 2003-08-29 release, run the
+following SQL scripts from the maintenance subdirectory:
+
+  archives/patch-ipblocks.sql
+  archives/patch-interwiki.sql
+  archives/patch-indexes.sql
+  interwiki.sql
+
+To copy in the Wikipedia language-prefix interwikis as well, add:
+
+  wikipedia-interwiki.sql
+
+
+== Translations ==
+
+New interface localization files are included for:
+  fy Frisian
+  ro Romanian
+  sl Slovene
+  sq Albanian
+  sr Serbian
+
+
+== Memcached ==
+
+Memcached is a distributed cache system. See http://www.danga.com/memcached/
+MediaWiki can optionally use memcached to store some data between calls
+to reduce load on the database. Currently this is limited to user and
+talk page notification data, interwiki prefix/URL matches, and the
+UTF-8 conversion tables.
+
+MediaWiki includes version 1.0.10 of the (GPL'd) PHP memcached client by
+Ryan Gilfether; if memcached is disabled it acts as a dummy object with
+minimal overhead.
+
+To use memcached you'll need PHP installed with sockets support (this is not
+in the default configure options). See docs/memcached for some more details.
+
+Additionally, you can store login session data in memcached instead of the
+local filesystem, which can help to enable load-balancing by letting login
+sessions transparently work on multiple front-end web servers. (The primary
+other issue is with uploads, which requires some care in handling.)
+
+To enable this, set $wgSessionsInMemcached = true; and set $wgCookieDomain
+appropriately if exposing multiple hostnames. This system is new and may be
+volatile; login sessions will fail dramatically if memcached is unavailable
+when this option is turned on.
+
+
+== Online documentation ==
+
+Documentation for both end-users and site administrators is currently being
+built up on Meta-Wikipedia, and is covered under the GNU Free Documentation
+License:
+
+  http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide
+
+
+== Mailing list ==
+
+A MediaWiki-l mailing list has been set up distinct from the Wikipedia
+wikitech-l list:
+
+  http://mail.wikipedia.org/mailman/listinfo/mediawiki-l
+
+
+== UseModWiki import script ==
+
+A stripped-down UseModWiki import script is available in the maintenance
+subdirectory. It is incomplete and requires a lot of manual clean-up, but
+does function for the brave and pure of heart.
+
+
+== Test suite removed ==
+
+The unmaintained Java-based test suite has been removed from the tarball
+release. If you really want it you can check it out from CVS.
+
-- 
2.20.1


From e9d6fcdfc1881d53b3bb288df27dde47c0bc7471 Mon Sep 17 00:00:00 2001
From: Brion Vibber 
Date: Mon, 8 Dec 2003 08:40:48 +0000
Subject: [PATCH 09/16] Update for 1.1.0

---
 RELEASE-NOTES | 60 ++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 47 insertions(+), 13 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 20e8075b99..5bb4ee4284 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,9 +1,39 @@
 = MediaWiki release notes =
 
-Stable branch snapshot, release 2003-11-18. This is the version of MediaWiki
-that we're running on Wikipedia as of this date.
+== Version 1.1.0, 2003-12-08 ==
 
-== Overview of changes from mediawiki-20031117 release: ==
+This is the new production release. Any following 1.1.x releases are expected
+to contain only bug fixes; developments of new features will go towards a 1.2.0
+release.
+
+New features in 1.1:
+* New wiki table syntax:
+  http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide:_Using_tables
+* User-editable interface messages:
+  http://meta.wikipedia.org/wiki/MediaWiki_namespace
+* XML-wrapped page source export with optional history:
+  http://meta.wikipedia.org/wiki/XML_import_and_export
+  (There is not yet an import function!)
+
+Fixes and tweaks:
+* linkscc table caches link data for rendering; faster rebuildlinks.php
+* Numerous bugs in Cologne Blue skin fixed
+* Login gives warning about missing cookies
+* Block log, protection log added; deletion log now includes undeletions
+* Deletion & upload logs now escape comment text properly
+* Problems with  segments in section titles etc mitigated
+* Contributions offset and minor edit bugs fixed
+* Whatlinkshere now sorted alphabetically
+* Various small bugs fixed.
+
+=== Database changes ===
+
+"linkscc" table added. If upgrading manually (rather than with update.php),
+run maintenance/archives/patch-linkscc.sql to create the table.
+
+Older releases were dated snapshots from the old 'stable' branch:
+
+== mediawiki-20031118 ==
 
 * Image deletion fixed.
 * Deletion of image old revisions now restricted to sysops
@@ -11,7 +41,7 @@ that we're running on Wikipedia as of this date.
 * Fixed maintenance scripts broken by last release's security fix
 * Many errors in rebuildlinks script fixed.
 
-== Overview of changes from mediawiki-20031107 release: ==
+== mediawiki-20031117 ==
 
 * SECURITY FIX: stricter checking of include path
 * Fixed user contributions next/prev bug
@@ -33,7 +63,7 @@ that we're running on Wikipedia as of this date.
 No database changes since 20031107; upgrading should be clean.
 
 
-== Overview of changes from mediawiki-20030829 release: ==
+== mediawiki-20031107 ==
 
 * Fixed various bugs!
 * Some speed improvements from tweaks to the table indexes
@@ -47,7 +77,7 @@ No database changes since 20031107; upgrading should be clean.
 * Uploads disabled by default (see below)
 
 
-== Security note ==
+=== Security note ===
 
 Uploads are now disabled by default. If you've set up a secure configuration
 you can reenable uploads by putting:
@@ -78,7 +108,7 @@ stealing JavaScript attacks. Example Apache config fragment:
   
 
 
-== Database updates ==
+=== Database updates ===
 
 If you're using update.php, the necessary database changes should
 be made automatically.
@@ -96,7 +126,7 @@ To copy in the Wikipedia language-prefix interwikis as well, add:
   wikipedia-interwiki.sql
 
 
-== Translations ==
+=== Translations ===
 
 New interface localization files are included for:
   fy Frisian
@@ -106,7 +136,7 @@ New interface localization files are included for:
   sr Serbian
 
 
-== Memcached ==
+=== Memcached ===
 
 Memcached is a distributed cache system. See http://www.danga.com/memcached/
 MediaWiki can optionally use memcached to store some data between calls
@@ -132,7 +162,7 @@ volatile; login sessions will fail dramatically if memcached is unavailable
 when this option is turned on.
 
 
-== Online documentation ==
+=== Online documentation ===
 
 Documentation for both end-users and site administrators is currently being
 built up on Meta-Wikipedia, and is covered under the GNU Free Documentation
@@ -141,7 +171,7 @@ License:
   http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide
 
 
-== Mailing list ==
+=== Mailing list ===
 
 A MediaWiki-l mailing list has been set up distinct from the Wikipedia
 wikitech-l list:
@@ -149,15 +179,19 @@ wikitech-l list:
   http://mail.wikipedia.org/mailman/listinfo/mediawiki-l
 
 
-== UseModWiki import script ==
+=== UseModWiki import script ===
 
 A stripped-down UseModWiki import script is available in the maintenance
 subdirectory. It is incomplete and requires a lot of manual clean-up, but
 does function for the brave and pure of heart.
 
 
-== Test suite removed ==
+=== Test suite removed ===
 
 The unmaintained Java-based test suite has been removed from the tarball
 release. If you really want it you can check it out from CVS.
 
+
+== mediawiki-20030829 ==
+
+First release under MediaWiki name.
-- 
2.20.1


From 9f371cf9a13d4e2a568072793f1b1eea7680a75e Mon Sep 17 00:00:00 2001
From: Brion Vibber 
Date: Mon, 8 Dec 2003 08:57:50 +0000
Subject: [PATCH 10/16] more 1.1.0

---
 RELEASE-NOTES | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 5bb4ee4284..9442e28f8e 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -14,6 +14,7 @@ New features in 1.1:
 * XML-wrapped page source export with optional history:
   http://meta.wikipedia.org/wiki/XML_import_and_export
   (There is not yet an import function!)
+* "Magic words"
 
 Fixes and tweaks:
 * linkscc table caches link data for rendering; faster rebuildlinks.php
@@ -26,6 +27,20 @@ Fixes and tweaks:
 * Whatlinkshere now sorted alphabetically
 * Various small bugs fixed.
 
+Internal changes:
+* wfQuery has had a second parameter inserted, DB_READ or DB_WRITE. This value
+  is not actually used so far.
+* Partial code for categories and Smarty template-based skins is in the tree
+  but disabled.
+* Parts of Article.php have been moved to EditPage.php and ImagePage.php.
+
+New translations:
+* fi - Finnish
+* ia - Interlingua
+* no - Norwegian
+* sk - Slovak
+* ta - Tamil
+
 === Database changes ===
 
 "linkscc" table added. If upgrading manually (rather than with update.php),
-- 
2.20.1


From fc4316ba425685dfdfda2b362b1e2af2cb8a6174 Mon Sep 17 00:00:00 2001
From: Brion Vibber 
Date: Mon, 8 Dec 2003 09:13:24 +0000
Subject: [PATCH 11/16] Grab MediaWiki logo from stable

---
 images/wiki.png | Bin 4029 -> 23064 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/images/wiki.png b/images/wiki.png
index 66a1f03c09cdcb17e2a356a9adeac4b2f5818fe6..69fce98855c288508a6d71711944878373177fde 100644
GIT binary patch
literal 23064
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

literal 4029
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
Date: Mon, 8 Dec 2003 09:19:11 +0000
Subject: [PATCH 12/16] Don't complain about empty log file... I thought this
 had already been fixed

---
 update.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/update.php b/update.php
index fc95ba1752..0e6b7ded8a 100644
--- a/update.php
+++ b/update.php
@@ -79,10 +79,12 @@ function do_update_files() {
 	copyfile( "./languages", "Language.php", $IP );
 	copyfile( "./languages", "Language" . ucfirst( $wgLanguageCode ) . ".php", $IP );
 	
-	$fp = fopen( $wgDebugLogFile, "w" );
-	if ( false === $fp ) {
-		print "Could not create log file \"{$wgDebugLogFile}\".\n";
-		exit();
+	if( !empty( $wgDebugLogFile ) ) {
+		$fp = fopen( $wgDebugLogFile, "w" );
+		if ( false === $fp ) {
+			print "Could not create log file \"{$wgDebugLogFile}\".\n";
+			exit();
+		}
 	}
 	$d = date( "Y-m-d H:i:s" );
 	fwrite( $fp, "Wiki debug log file created {$d}\n\n" );
-- 
2.20.1


From 57c2cffd82a30afaf0d584855b9784a166a7ff42 Mon Sep 17 00:00:00 2001
From: Brion Vibber 
Date: Mon, 8 Dec 2003 09:19:53 +0000
Subject: [PATCH 13/16] Don't complain about empty log file... I thought this
 had already been fixed

---
 update.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/update.php b/update.php
index 0e6b7ded8a..f91a80ce3f 100644
--- a/update.php
+++ b/update.php
@@ -85,10 +85,10 @@ function do_update_files() {
 			print "Could not create log file \"{$wgDebugLogFile}\".\n";
 			exit();
 		}
+		$d = date( "Y-m-d H:i:s" );
+		fwrite( $fp, "Wiki debug log file created {$d}\n\n" );
+		fclose( $fp );
 	}
-	$d = date( "Y-m-d H:i:s" );
-	fwrite( $fp, "Wiki debug log file created {$d}\n\n" );
-	fclose( $fp );
 	
 	if ( $wgUseTeX ) {
 		copyfile( "./math", "texvc", "{$IP}/math", 0775 );
-- 
2.20.1


From 97a31762cbf05d9850bfd16e9d16fa2cb27eba1b Mon Sep 17 00:00:00 2001
From: Brion Vibber 
Date: Mon, 8 Dec 2003 09:22:54 +0000
Subject: [PATCH 14/16] Remove old mozilla hack

---
 stylesheets/wikibits.js | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/stylesheets/wikibits.js b/stylesheets/wikibits.js
index efcd7466c5..ba8ce1d8d3 100644
--- a/stylesheets/wikibits.js
+++ b/stylesheets/wikibits.js
@@ -74,27 +74,3 @@ function toggleToc() {
 	}
 }
 
-/* CHECK MERGE @@@ */
-/* Temporary hack for Mozilla bug; revert to quirks mode handling of 
     */
-if(navigator.userAgent &&
-   navigator.userAgent.indexOf('Gecko') != -1 &&
-   navigator.userAgent.indexOf('KHTML') == -1) {
-	document.writeln(
-	'');
-}
-
-- 
2.20.1


From 46334266ae276e0ded76423b075749839f22637e Mon Sep 17 00:00:00 2001
From: Brion Vibber 
Date: Mon, 8 Dec 2003 09:24:04 +0000
Subject: [PATCH 15/16] blah blah

---
 RELEASE-NOTES | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9442e28f8e..3737f8a1a0 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -25,6 +25,8 @@ Fixes and tweaks:
 * Problems with  segments in section titles etc mitigated
 * Contributions offset and minor edit bugs fixed
 * Whatlinkshere now sorted alphabetically
+* Various exciting new profiling options.
+* Debug log is off by default.
 * Various small bugs fixed.
 
 Internal changes:
-- 
2.20.1


From bb79330521286602ff65e82ec6737148875181e3 Mon Sep 17 00:00:00 2001
From: Brion Vibber 
Date: Mon, 8 Dec 2003 09:25:13 +0000
Subject: [PATCH 16/16] Remove mention of obsolete test suite

---
 install.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/install.php b/install.php
index 6e9c84d19b..6355cd67ad 100644
--- a/install.php
+++ b/install.php
@@ -122,8 +122,7 @@ populatedata(); # Needs internationalized messages
 print "Adding indexes...\n";
 dbsource( "./maintenance/indexes.sql", $rconn );
 
-print "Done.\nBrowse \"{$wgServer}{$wgScript}\" to test,\n" .
-  "or \"run WikiSuite -b -o\" in test suite.\n";
+print "Done.\nBrowse \"{$wgServer}{$wgScript}\" to test.\n";
 exit();
 
 #
-- 
2.20.1