Merge branch 'Release02x01'

foswiki · May 24, 2017 · e97db54 · e97db54
2 parents 01fd5e8 + a9205d0
commit e97db54
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 25 deletions.
diff --git a/NatEditPlugin/data/System/NatEditPlugin.txt b/NatEditPlugin/data/System/NatEditPlugin.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1493947845" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1495512067" format="1.1" version="1"}%
 ---+!! Natural Edit Plugin
 %TOC%
 
@@ -56,7 +56,8 @@ is sufficient.
 
 |  Copyright &copy;: | 2007-2017 Michael Daum http://michaeldaumconsulting.com |
 |  Change History: | |
-|  04 May 2017 | Foswikitask:Item14388: NatEditPlugin does not honor the ScriptSuffix setting, and doesn't accommodate short URLs. |
+|  04 May 2017 | Foswikitask:Item14388: NatEditPlugin does not honor the ScriptSuffix setting, and doesn't accommodate short URLs.<br/>
+                 Foswikitask:Item14404: NatEdit Save and Continue action fails on mod_perl systems. |
 |  20 Jan 2017 | Foswikitask:Item14265: NatEdit plugin leaves UI blocked after some save errors<br/>\
                  Foswikitask:Item14285: fixed error clicking on disabled toolbar buttons |
 |  06 Jan 2016 | Add helper to insert a data form table header. |
@@ -182,4 +183,4 @@ is sufficient.
 %META:FIELD{name="License" title="License" value="GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]])"}%
 %META:FIELD{name="Home" title="Home" value="http://foswiki.org/Extensions/%25$ROOTMODULE%25"}%
 %META:FIELD{name="Support" title="Support" value="http://foswiki.org/Support/%25$ROOTMODULE%25"}%
-%META:FILEATTACHMENT{name="screenshot1.png" attr="h" comment="" date="1493947845" size="64487" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="screenshot1.png" attr="h" comment="" date="1495512067" size="64487" user="ProjectContributor" version="1"}%
diff --git a/RCSStoreContrib/lib/Foswiki/Store/Rcs/RcsLiteHandler.pm b/RCSStoreContrib/lib/Foswiki/Store/Rcs/RcsLiteHandler.pm
@@ -715,7 +715,7 @@ sub _patch {
     local $SIG{__WARN__} = sub {
         print STDERR
 "WARNING: Potentially corrupt RCS history $this->{file} at revision $rev: "
-          . shift . "\n";
+          . shift(@_) . "\n";
     };
 
     my $adj       = 0;

diff --git a/core/data/System/ReleaseHistory.txt b/core/data/System/ReleaseHistory.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1494895208" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1495512067" format="1.1" version="1"}%
 %META:TOPICPARENT{name="AdminDocumentationCategory"}%
 History of Foswiki
 %STARTINCLUDE%
@@ -7,9 +7,13 @@ History of Foswiki
 ---+ Appendix A: Foswiki Development Time-line
 
 %TOC%
+---++ Foswiki Release 2.1.4-RC3 - 23 May 2017
+
+Foswiki 2.1.4-RC3 was built on 23 May 2017. It is a release that contains 30 fixes.
+
 ---++ Foswiki Release 2.1.4-RC2 - 15 May 2017
 
-Foswiki 2.1.4-RC2 was built on 13 May 2017. It is a release that contains 25 fixes.
+Foswiki 2.1.4-RC2 was built on 15 May 2017. It is a release that contains 25 fixes.
 
 ---++ Foswiki Release 2.1.4-RC1 - 4 May 2017
 

diff --git a/core/data/System/ReleaseNotes02x01.txt b/core/data/System/ReleaseNotes02x01.txt
@@ -1,6 +1,6 @@
-%META:TOPICINFO{author="ProjectContributor" date="1494895208" format="1.1"  version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1495512067" format="1.1"  version="1"}%
 %META:TOPICPARENT{name="ReleaseHistory"}%
----+!! Foswiki Release 2.1.4-RC2
+---+!! Foswiki Release 2.1.4-RC3
 
 %TWISTY{showlink="Table of Contents..." hidelink="hide TOC"}%
 %TOC%
@@ -55,7 +55,7 @@ Foswiki is released under the GNU General Public License.
    * Foswiki 2.1.1 was built on 30 Apr 2016. It is a release that contains 36 fixes and 21 enhancements.
    * Foswiki 2.1.2 was built on 2 May 2016. It is a release that contains 1 fix.
    * Foswiki 2.1.3 was built on 12 Feb 2017. It is a release that contains 68 fixes and 21 enhancements.
-   * Foswiki 2.1.4-RC2 was built on 15 May 2017. It is a release that contains 25 fixes.
+   * Foswiki 2.1.4-RC3 was built on 23 May 2017. It is a release that contains 30 fixes.
 
 
 ---++ Pre-installed Extensions
@@ -503,6 +503,11 @@ Foswiki thanks the Translators for their efforts.  If you are interesting in hel
 | [[%BUGS%/Item14388][Item14388]] | NatEditPlugin does not honor the ScriptSuffix setting, and doesn't accommodate short URLs. |
 | [[%BUGS%/Item14392][Item14392]] | WebPreferences topics contain empty DENY rules that would be honored if ={AccessControlACL}{EnableDeprecatedEmptyDeny}= is enabled. |
 | [[%BUGS%/Item14396][Item14396]] | Don't redirect to relative paths. 302 redirects should be absolute Locations. |
+| [[%BUGS%/Item14400][Item14440]] | Configure settings leak into the global $Foswiki::cfg hash in fcgi environment |
+| [[%BUGS%/Item14401][Item14401]] | Foswiki crashes if PageCache is enabled with missing dependencies. |
+| [[%BUGS%/Item14402][Item14402]] | Invalid default in FastCGIEngineContrib example foswiki.defaults file. |
+| [[%BUGS%/Item14404][Item14404]] | NatEdit Save and Continue action fails on mod_perl systems. |
+| [[%BUGS%/Item14405][Item14405]] | Redirect after validation with HTTPS proxy for HTTP site results in unsafe redirect. |
 
 </noautolink>
 

diff --git a/core/lib/Foswiki/Configure/Pluggables/LANGUAGES.pm b/core/lib/Foswiki/Configure/Pluggables/LANGUAGES.pm
@@ -15,6 +15,7 @@ use warnings;
 
 use Locale::Language ();
 use Locale::Country  ();
+use Error qw{ :try };
 
 use Assert;
 use Foswiki::Configure::Load  ();
@@ -43,26 +44,41 @@ sub construct {
         $keys = "'$keys'" if $keys =~ m/\W/;
 
         my $label;
-        if ( $lang =~ m/^(\w+)-(\w+)$/ ) {
-            my ( $lname, $cname ) = (
-                ( Locale::Language::code2language($1) || '' ),
-                ( Locale::Country::code2country($2)   || '' )
-            );
-            if ( $lname && $cname ) {
-                $label = "$lname ($cname)";
-            }
-            elsif ($lname) {
-                $label = "$lname ($2)";
-            }
-            elsif ($cname) {
-                $label = "$1 ($cname)";
+
+# SMELL: Language::Codes _code() is documented as taking a 3rd parameter, $no_check_code
+# as useful when adding languages. Set no_check_code so we don't crash for unknown languages
+# ie. Klingon. As of perl 5.26, it crashes for unkown languages.
+
+        try {
+            if ( $lang =~ m/^(\w+)-(\w+)$/ ) {
+                my ( $lname, $cname ) = (
+                    ( Locale::Language::code2language( $1, undef, 1 ) || '' ),
+                    ( Locale::Country::code2country( $2, undef, 1 ) || '' )
+                );
+                if ( $lname && $cname ) {
+                    $label = "$lname ($cname)";
+                }
+                elsif ($lname) {
+                    $label = "$lname ($2)";
+                }
+                elsif ($cname) {
+                    $label = "$1 ($cname)";
+                }
+                else {
+                    $label = "$lang";
+                }
             }
             else {
-                $label = "$lang";
+                $label = Locale::Language::code2language( $lang, undef, 1 )
+                  || "$lang";
             }
         }
-        else {
-            $label = Locale::Language::code2language($lang) || "$lang";
+        otherwise {
+            $label = $lang;
+        };
+
+        if ( $label eq 'tlh' ) {
+            $label = "Klingon";
         }
 
         my $value = Foswiki::Configure::Value->new(