Updated Mediawiki to 1.23.3
Removed mediawiki-postgresql-fixes.patch (fixed upstream)
This commit is contained in:
parent
dce3e9261b
commit
5c6e4e7433
@ -1,22 +0,0 @@
|
||||
diff --git a/includes/specials/SpecialActiveusers.php b/includes/specials/SpecialActiveusers.php
|
||||
index f739d3b..fdd8db3 100644
|
||||
--- a/includes/specials/SpecialActiveusers.php
|
||||
+++ b/includes/specials/SpecialActiveusers.php
|
||||
@@ -112,7 +112,7 @@ class ActiveUsersPager extends UsersPager {
|
||||
return array(
|
||||
'tables' => array( 'querycachetwo', 'user', 'recentchanges' ),
|
||||
'fields' => array( 'user_name', 'user_id', 'recentedits' => 'COUNT(*)', 'qcc_title' ),
|
||||
- 'options' => array( 'GROUP BY' => array( 'qcc_title' ) ),
|
||||
+ 'options' => array( 'GROUP BY' => array( 'qcc_title', 'user_name', 'user_id' ) ),
|
||||
'conds' => $conds
|
||||
);
|
||||
}
|
||||
@@ -349,7 +349,7 @@ class SpecialActiveUsers extends SpecialPage {
|
||||
__METHOD__,
|
||||
array(
|
||||
'GROUP BY' => array( 'rc_user_text' ),
|
||||
- 'ORDER BY' => 'NULL' // avoid filesort
|
||||
+ 'ORDER BY' => 'lastedittime DESC'
|
||||
)
|
||||
);
|
||||
$names = array();
|
@ -72,15 +72,13 @@ let
|
||||
|
||||
# Unpack Mediawiki and put the config file in its root directory.
|
||||
mediawikiRoot = pkgs.stdenv.mkDerivation rec {
|
||||
name= "mediawiki-1.23.1";
|
||||
name= "mediawiki-1.23.3";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "http://download.wikimedia.org/mediawiki/1.23/${name}.tar.gz";
|
||||
sha256 = "07z5j8d988cdg4ml4n0vs9fwmj0p594ibbqdid16faxwqm52dkhl";
|
||||
sha256 = "0l6798jwjwk2khfnm84mgc65ij53a8pnv30wdnn15ys4ivia4bpf";
|
||||
};
|
||||
|
||||
patches = [ ./mediawiki-postgresql-fixes.patch ];
|
||||
|
||||
skins = config.skins;
|
||||
|
||||
buildPhase =
|
||||
|
Loading…
Reference in New Issue
Block a user