Commit graph

25983 commits

Author SHA1 Message Date
Aaron Schulz
0790eab05a Merge "Use local context to get messages" 2012-06-08 20:32:34 +00:00
Aaron Schulz
facc1e47d4 Merge "Userlogin: Do not add a language link if it's the currently used language" 2012-06-07 22:37:18 +00:00
Timo Tijhof
8215303968 Merge "ResourceLoaderLanguageDataModule: clean up" 2012-06-07 21:09:32 +00:00
Aaron Schulz
9e4edba74f Merge "Use Title::newFromRow in ApiPageSet::processDbRow" 2012-06-07 21:03:33 +00:00
Aaron Schulz
addd53e07f Merge "do not output numberofviews, if $wgDisableCounters = true" 2012-06-07 21:02:41 +00:00
Aaron Schulz
199c1de467 Merge "Change order of login/create account" 2012-06-07 20:59:57 +00:00
Demon
9948a2a16d Merge "[FileBackend] Fixed writer-populater cache race condition." 2012-06-07 20:04:08 +00:00
Aaron
2524f394e2 [FileBackend] Fixed writer-populater cache race condition.
* Set the keys to PURGED on purge. We already only treat array values
  in cache is valid. This means that if a process reads the file, it
  caches in the meantime, and then the process tries to cache the file,
  the stale version will not be cached.

Change-Id: I7eb7b4529f8cea44b0d68c9149db4bcf100ac9d2
2012-06-07 12:56:11 -07:00
Aaron Schulz
38a42ed823 Merge "Misc fixes in RevisionDelete.php." 2012-06-07 19:13:16 +00:00
Siebrand
bc6fe21f64 Merge "(bug 37181) Removed hard coded parentheses in SpecialMIMEsearch.php" 2012-06-07 15:58:56 +00:00
robin
5ce5b0e44d Userlogin: Do not add a language link if it's the currently used language
(Just display the language name without a link)

Change-Id: I604d2905d73faf5b2242fdbf943262ae22e58a2c
2012-06-07 17:29:41 +02:00
Alexandre Emsenhuber
9d00a6acc3 Misc fixes in RevisionDelete.php.
* Use Linker::linkKnown() for links to revisions, we know that the page exists and other classes might be false since they might be old revisions
* Escape the result of Language::userTimeAndDate(), just in case
* Rewrote some code to do early return instead of nested if()'s
* Define variables only when they will actually be used

Change-Id: Ie1f16029020f980abba35d6322b89c95326f107b
2012-06-07 10:44:10 +02:00
Aaron Schulz
0160b0fb0a Merge "Fix error message for MySQL connection failures" 2012-06-07 06:16:19 +00:00
Aaron Schulz
0f2e55ea2e Merge "Change of Title->exists() to Title->isKnown() for subpage links" 2012-06-06 22:43:50 +00:00
Timo Tijhof
59a390c8b1 ResourceLoaderLanguageDataModule: clean up
Change-Id: Id64e7ec8f22cc74926ff374ca207bf19552398aa
2012-06-06 22:07:29 +02:00
Demon
776a121997 Merge "(bug 37138) Fix broken Google sitesearch in DatabaseError" 2012-06-06 18:23:46 +00:00
umherirrender
54a4a82f4c Change order of login/create account
With this the position of the login link in the right corner is not
changed with $wgUseCombindedLoginLink = false;
Gerrit has also first "register" and than "log in" in the corner.

Change-Id: I8d1000cf53ab792b3f69438004e5ae181acba645
2012-06-06 19:49:36 +02:00
Aaron Schulz
0eff0c6c97 Merge "Use local context to get messages and don't use implicit Message object to string conversion." 2012-06-06 17:29:33 +00:00
umherirrender
590f05ea13 do not output numberofviews, if $wgDisableCounters = true
Change-Id: I9975dceedeffafadf560ed71238c51b94eb8c3ad
2012-06-06 19:29:16 +02:00
Catrope
a07531a628 Merge "Increased uselessly low $wgBlockCIDRLimit default for IPv6." 2012-06-06 17:03:27 +00:00
Aaron Schulz
349d4ae514 Merge "(bug 37334) ForeignAPIFile::getDescription() should match parent" 2012-06-06 17:01:14 +00:00
umherirrender
f263c6bcf2 Use Title::newFromRow in ApiPageSet::processDbRow
This avoids a query per title (due to Title::exist) in ApiQueryInfo.
The 3 minimum fields are always selected in ApiPageSet

Change-Id: Ic4876f947357d84a2f37bec60db3ccd44fe236ac
2012-06-06 18:39:30 +02:00
Werdna
ebf2912801 Merge "Adds support to HTMLForm for rendering form fields wrapped in divs or just plain old (mostly) raw form fields." 2012-06-06 05:30:28 +00:00
Aaron Schulz
47de3d2aec Fixed infinite loop in tests with FSLockManager.
* If PHPUnit converts warnings to exceptions, any I/O warnings can throw
exceptions which leave locksHeld in an inconsistent state, breaking the
__destruct() function. This commits reorders the variable update slightly.

Change-Id: I5deac811e7b4d0bc71f3d4096b8d72711904a444
2012-06-05 22:07:09 -07:00
Chad Horohoe
90e2073329 (bug 37334) ForeignAPIFile::getDescription() should match parent
Fix for I1dd54611, which changed File::getDescription() without updating
ForeignAPIFile

Change-Id: I4d4d43c3a07bb1dd1c0001779992024bef962640
2012-06-05 20:29:40 -04:00
Aaron
8933e49ecd Increased uselessly low $wgBlockCIDRLimit default for IPv6.
Change-Id: I5abc83981912f304c4034a32063ba09bcf6aa1b1
2012-06-05 17:01:43 -07:00
awjrichards
c29fd59775 Big oops - merged to wrong branch.
Revert "Revert to arbitrarily old point before initial remote branch creation to help clean up"

This reverts commit ee0d3d330f
2012-06-05 22:58:54 +00:00
Timo Tijhof
3b073fa356 (bug 37138) Fix broken Google sitesearch in DatabaseError
Change-Id: I31dc64f83ce8767dcdd84597844b0819840f60e1
2012-06-05 19:47:17 +02:00
Krinkle
727d1d45cc Merge "Reverse the dependency for mediawiki.language.data" 2012-06-05 13:58:09 +00:00
Santhosh Thottingal
4c6c50f206 Reverse the dependency for mediawiki.language.data
* Previously mediawiki.language.data depended on mediawiki.language,
  making any module using langauge data having to explicitly define
  it as a dependency. This is not good. We should abstract the data
  generation part and for the users of the module.
  mediawiki.language should take care of having the required data.

* So, reversing the dependency so that mediawiki.language depends on
  mediawiki.language.data. Then a simple dependency declaration with
  "mediawiki.language" is enough to have associated data available.

This supersedes change set I810fb0a5

Change-Id: Iede836bb3e2fd700cb7c58caeebe9ec2e0043dfb
2012-06-05 15:54:27 +02:00
Siebrand
1cd5061d72 Merge "Add new message 'showhideselectedlogentries' for revdel of logs." 2012-06-05 06:50:08 +00:00
Liangent
3c3b564ec2 Add new message 'showhideselectedlogentries' for revdel of logs.
What we're hiding are not "revisions" here...

Change-Id: I3d3d75dea240ff189fc929e0a24f8e5449a4e0c6
2012-06-05 09:31:47 +08:00
Siebrand
02e82b7031 Merge "(bug 37180) Removed hard coded parentheses in SpecialVersion.php" 2012-06-05 01:08:51 +00:00
Victor Vasiliev
dac90fa456 (bug 37330) Fix wrong block being displayed due to autoblock in place.
Autoblocks triggered latest block log entry being displayed, which was
naturally the wrong one, since autoblocks are not put into a block log.

Change-Id: Ic08880c18a778d5294bb934c764a70dbd7800b70
2012-06-05 01:30:33 +02:00
Demon
710824bd86 Merge "[FileBackend] Gave doQuickOperations() some wrapper methods just like doOperations()." 2012-06-04 20:47:20 +00:00
Demon
0593465614 Merge "[FileBackend] Purge Swift process cache before container delete for sanity." 2012-06-04 20:46:32 +00:00
Demon
575019d19c Merge "[FileBackend] Worked around Akamai CDN purge limits." 2012-06-04 20:45:10 +00:00
Demon
1802efce47 Merge "Fixed destructor in FSLockManager to clear all the locks." 2012-06-04 20:43:09 +00:00
Demon
1dc986a90f Merge "[FileRepo] Made getDescription() respect *_deleted fields." 2012-06-04 20:41:52 +00:00
Demon
a2d4193cd9 Merge "Made default BagOStuff functions work consistently." 2012-06-04 20:36:31 +00:00
Alexandre Emsenhuber
49a7806281 Changed a call to Title::getEscapedText() which is now deprecated.
Change-Id: I3cb6e9b4cf4a70ff3f30662ed12152a6f9d3f170
2012-06-04 12:53:53 +02:00
pmolina
69591db3b4 (bug 37180) Removed hard coded parentheses in SpecialVersion.php
Patch set 4:
* Use params() instead of rawParams() because there is no need for raw.
* Specify processing explicitely.

Change-Id: If5f1c26f221bdb060b5944ef5e3cdb64d76154e3
2012-06-04 09:42:42 +02:00
Aaron Schulz
5860bf6c76 Merge "Replace calls to deprecated Article::doWatch and Article::doUnwatch" 2012-06-03 23:45:21 +00:00
Aaron Schulz
3c1495e968 Made default BagOStuff functions work consistently.
* Made getMulti() only return keys for items that exists.
* Made add() return false if the item already exist.
* Made replace() return false it the item does not already exist.

Change-Id: Idb9d9843ace0c81f71abfc22b90e30eb33d7579d
2012-06-03 16:29:39 -07:00
Dereckson
79dcce058e (bug 37179) Allow undelete revision rows l10n
Patch set 5: Update spacing in changes in SpecialUndelete.php
             per convention.

Change-Id: I95756fa53c1f3b2a62fa9b5f6a63475dd5462442
2012-06-04 00:33:16 +02:00
Aaron Schulz
46b919028c Merge "Revert "Purge Squid variant pages based on page language (not $wgContLang)" per CR comments. I merged this one too quickly." 2012-06-03 21:08:55 +00:00
Aaron Schulz
10c37d58fe Revert "Purge Squid variant pages based on page language (not $wgContLang)" per CR comments. I merged this one too quickly.
This reverts commit 0f9b9d5144
2012-06-03 21:07:58 +00:00
Alexandre Emsenhuber
2c7bf8b8b8 Added missing GPLv2 headers in some places.
Also made file/class documentation more consistent.

Change-Id: Ie95c594fcd686ef30dadc7574d3e5b47236a8638
2012-06-03 22:54:44 +02:00
Reedy
6b834dfcf8 Merge "Use new xsd schema 0.7 in Export.php" 2012-06-03 19:42:46 +00:00
umherirrender
ad6072fc63 Use new xsd schema 0.7 in Export.php
Change Idb82fe62 added a new xsd, but didn't use it.

Change-Id: I030d245715174daeaf24723ebc156ab36761a035
2012-06-03 21:05:21 +02:00