Merge "RCFilters: Enable 'View newest'"

diff --git a/includes/libs/IP.php b/includes/libs/IP.php
index b22f06d..bde8c69 100644 (file)
--- a/includes/libs/IP.php
+++ b/includes/libs/IP.php
@@ -67,8 +67,6 @@ define( 'IP_ADDRESS_STRING',
  * and IP blocks.
  */
 class IP {
-       /** @var IPSet */
-       private static $proxyIpSet = null;
 
        /**
         * Determine if a string is as valid IP address or network (CIDR prefix).

diff --git a/resources/src/mediawiki.legacy/shared.css b/resources/src/mediawiki.legacy/shared.css
index fbc9816..bace9d0 100644 (file)
--- a/resources/src/mediawiki.legacy/shared.css
+++ b/resources/src/mediawiki.legacy/shared.css
@@ -105,6 +105,11 @@ span.comment {
        clear: both;
 }
 
+/* Prevent editing textarea from jumping when toolbar is loaded */
+#toolbar {
+       height: 22px;
+}
+
 /* Edit font preference */
 /* TODO: for 'default' on non-textareas we could compute the default font of textarea in the client */
 .mw-editfont-default:not( textarea ) {