Item14288: Merge remote-tracking branch 'master'

foswiki · May 24, 2017 · 74811eb · 74811eb
2 parents f1640b5 + 9acb49b
commit 74811eb
Show file tree

Hide file tree

Showing 5 changed files with 81 additions and 22 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="1494916015" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1495606515" format="1.1" version="1"}%
 ---+!! Natural Edit Plugin
 %FORMFIELD{"Description"}%
 
@@ -56,7 +56,8 @@ is sufficient.
 
 ---++ Change History
 %TABLE{columnwidths="7em" tablewidth="100%"}%
-|  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. |
@@ -181,4 +182,4 @@ is sufficient.
 %META:FIELD{name="Repository" title="Repository" value="https://github.com/foswiki/distro"}%
 %META:FIELD{name="Support" title="Support" value="https://foswiki.org/Support/%25$ROOTMODULE%25"}%
 %META:FIELD{name="Version" title="Version" value="%25$VERSION%25"}%
-%META:FILEATTACHMENT{name="screenshot1.png" attr="h" comment="" date="1494916015" size="64487" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="screenshot1.png" attr="h" comment="" date="1495606515" 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="1486929101" 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,6 +7,17 @@ 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 15 May 2017. It is a release that contains 25 fixes.
+
+---++ Foswiki Release 2.1.4-RC1 - 4 May 2017
+
+Foswiki 2.1.4-RC1 was built on 04 May 2017. It is a release that contains 21 fixes.
 
 ---++ Foswiki Release 2.1.3 - 12 Feb 2017
 

diff --git a/core/data/System/ReleaseNotes02x01.txt b/core/data/System/ReleaseNotes02x01.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1486929101" format="1.1"  version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1495606515" format="1.1"  version="1"}%
 %META:TOPICPARENT{name="ReleaseHistory"}%
 ---+!! Foswiki Release 2.1.3
 
@@ -55,6 +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-RC3 was built on 23 May 2017. It is a release that contains 30 fixes.
 
 
 ---++ Pre-installed Extensions
@@ -474,6 +475,40 @@ Foswiki thanks the Translators for their efforts.  If you are interesting in hel
 | [[%BUGS%/Item14229][Item14229]] | Upgrade JQueryPlugin to jsrender 0.9.83. |
 | [[%BUGS%/Item14230][Item14230]] | jquery.maskedinput initializer does not match documentation. |
 
+---++ Foswiki Release 2.1.4 Details
+---+++ Fixes
+
+| [[%BUGS%/Item12090][Item12090]] | Field name -with description- in Forms not working properly. |
+| [[%BUGS%/Item13246][Item13246]] | Context =header_text= needs better documentation. |
+| [[%BUGS%/Item13339][Item13339]] | Warning or errors icons in configure get stuck unless page is reloaded. |
+| [[%BUGS%/Item13766][Item13766]] | EditRowPlugin columns widths are jumping to wider size when you hoover the mouse over the table. |
+| [[%BUGS%/Item13907][Item13907]] | UpdatesPlugin Report of required update should list the backlevel extensions. |
+| [[%BUGS%/Item13954][Item13954]] | Extensions with "pluggable" components cause errors: No such value {Store}{Implementation}. |
+| [[%BUGS%/Item14234][Item14234]] | Clicking pencil for first row (erp_row=0) opens editor on entire table.  |
+| [[%BUGS%/Item14324][Item14324]] | Perl 5.25.10 reports unescaped left brace in regular expression errors. |
+| [[%BUGS%/Item14328][Item14328]] | Foswiki::Net crashes with uninitialized value in pattern match when sending email for older CPAN modules. |
+| [[%BUGS%/Item14337][Item14337]] | SCRIPTURL paths and inline scripts make javascript signing more difficult than needed. |
+| [[%BUGS%/Item14346][Item14346]] | Systemd service file has issues, needs better documentation. |
+| [[%BUGS%/Item14347][Item14347]] | Prune the cruft from the tools dir and improve tools script documentation. |
+| [[%BUGS%/Item14349][Item14349]] | EditRowPlugin Edit Table button not functional on IE 11. |
+| [[%BUGS%/Item14350][Item14350]] | OopsException documentation has incorrect example. |
+| [[%BUGS%/Item14351][Item14351]] | Uninitialized value warning when changerows is used with EditRowPlugin. |
+| [[%BUGS%/Item14366][Item14366]] | =use CGI::Carp= in bin scripts BEGIN block cannot be found via LocalLib.cfg override. |
+| [[%BUGS%/Item14368][Item14368]] | Failure to handle edge cases leads to obscure bug in RCS. |
+| [[%BUGS%/Item14369][Item14369]] | Document parameters for USERNAME, WIKINAME and WIKIUSERNAME macros. |
+| [[%BUGS%/Item14370][Item14370]] | Foswiki::Func::removeUserFromGroup docmentation is incorrect. |
+| [[%BUGS%/Item14372][Item14372]] | JQueryPlugin ui-draggable got dropped from  Config.spec. |
+| [[%BUGS%/Item14377][Item14377]] | Error message requires some encoding. |
+| [[%BUGS%/Item14381][Item14381]] | mod_perl unexpectedly decodes the URI, and X-FoswikiURI header should be debug only. |
+| [[%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,37 @@ 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)";
+
+        try {
+            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)";
+                }
+                else {
+                    $label = "$lang";
+                }
             }
             else {
-                $label = "$lang";
+                $label = Locale::Language::code2language($lang)
+                  || "$lang";
             }
         }
-        else {
-            $label = Locale::Language::code2language($lang) || "$lang";
+        otherwise {
+            $label = $lang;
+        };
+
+        if ( $label eq 'tlh' ) {
+            $label = "Klingon";
         }
 
         my $value = Foswiki::Configure::Value->new(