Merge "IP: Remove unused deprecated ::isValidBlock() method"

diff --git a/includes/search/SearchResultSet.php b/includes/search/SearchResultSet.php
index 18331dd..3d3b446 100644 (file)
--- a/includes/search/SearchResultSet.php
+++ b/includes/search/SearchResultSet.php
@@ -84,7 +84,7 @@ class SearchResultSet implements Countable, IteratorAggregate {
                        // This class will eventually be abstract. SearchEngine implementations
                        // already have to extend this class anyways to provide the actual
                        // search results.
-                       wfDeprecated( __METHOD__, 1.32 );
+                       wfDeprecated( __METHOD__, '1.32' );
                }
                $this->containedSyntax = $containedSyntax;
                $this->hasMoreResults = $hasMoreResults;

diff --git a/languages/messages/MessagesSe.php b/languages/messages/MessagesSe.php
index 4859719..11547f4 100644 (file)
--- a/languages/messages/MessagesSe.php
+++ b/languages/messages/MessagesSe.php
@@ -134,6 +134,14 @@ $magicWords = [
        'img_link'                  => [ '1', 'liŋka=$1', 'link=$1' ],
 ];
 
+$defaultDateFormat = 'mdy';
+
+$dateFormats = [
+       'mdy time' => 'G.i',
+       'mdy date' => 'xg j "b." Y',
+       'mdy both' => 'xg j "b." Y "dii." G.i',
+];
+
 $separatorTransformTable = [ ',' => "\u{00A0}", '.' => ',' ];
 
 $linkTrail = '/^(:?[a-zàáâçčʒǯđðéèêëǧǥȟíìîïıǩŋñóòôõßšŧúùûýÿüžþæøåäö]+)(.*)$/sDu';