Item000: Merge branch 'Release02x01'

foswiki · May 5, 2016 · 097e76e · 097e76e
2 parents 6c21598 + 9456796
commit 097e76e
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 6 deletions.
diff --git a/EditTablePlugin/.gitignore b/EditTablePlugin/.gitignore
@@ -8,3 +8,5 @@
 /EditTablePlugin.zip
 /EditTablePlugin_installer
 /EditTablePlugin_installer.pl
+/pub/System/EditTablePlugin/edittable.css
+/pub/System/EditTablePlugin/edittable.js
diff --git a/UnitTestContrib/test/unit/CacheTests.pm b/UnitTestContrib/test/unit/CacheTests.pm
@@ -208,9 +208,40 @@ sub tear_down {
     unlink("$Foswiki::cfg{WorkingDir}/${$}_generic.db");
 }
 
+sub clearCache {
+    my $this = shift;
+
+    my $query = Unit::Request->new( { skin => ['none'], refresh => 'all', } );
+    $query->path_info("/System/WebHome");
+    $query->method('GET');
+
+    $this->createNewFoswikiSession( $Foswiki::cfg{AdminUserLogin},
+        $query, { view => 1 } );
+
+    my ( $resp, $result, $stdout, $stderr ) = $this->capture(
+        sub {
+            try {
+                no strict 'refs';
+                &{$UI_FN}( $this->{session} );
+                use strict 'refs';
+                $Foswiki::engine->finalize( $this->{session}{response},
+                    $this->{session}{request} );
+            }
+            catch Foswiki::OopsException with {
+                my $e = shift;
+                $this->assert( 0, "Incorrect exception: " . $e->stringify() );
+            };
+
+        }
+    );
+
+}
+
 sub check {
     my ( $this, $pathinfo ) = @_;
 
+    $this->clearCache();
+
     $UI_FN ||= $this->getUIFn( $this->{uifn} );
     $Foswiki::cfg{Cache}{Debug} = 1;
     my $query = Unit::Request->new( { skin => ['none'], } );
@@ -306,6 +337,8 @@ sub check_refresh {
     my $pathinfo = shift;
     my $refresh  = shift;
 
+    $this->clearCache();
+
     my $user =
       ( $refresh eq 'all' )
       ? $Foswiki::cfg{AdminUserLogin}

diff --git a/core/data/System/ReleaseHistory.txt b/core/data/System/ReleaseHistory.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1460171793" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1462215486" format="1.1" version="1"}%
 %META:TOPICPARENT{name="AdminDocumentationCategory"}%
 History of Foswiki
 %STARTINCLUDE%
@@ -7,7 +7,11 @@ History of Foswiki
 ---+ Appendix A: Foswiki Development Time-line
 
 %TOC%
----+ Foswiki Release 2.1.1-RC1 - 08 Apr 2016
+
+---++ Foswiki Release 2.1.2 - 2 May 2016
+Foswiki 2.1.2 was built on 2 May 2016. It is a release that contains 1 fix.
+
+---++ Foswiki Release 2.1.1 - 30 Apr 2016
 
 Foswiki 2.1.1-RC1 was built on 08 Apr 2016. It is a release that contains 30 fixes and 20 enhancements.
 

diff --git a/core/data/System/ReleaseNotes02x01.txt b/core/data/System/ReleaseNotes02x01.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1460171793" format="1.1"  version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1462215486" format="1.1"  version="1"}%
 %META:TOPICPARENT{name="ReleaseHistory"}%
 ---+!! Foswiki Release 2.1.1
 
@@ -52,7 +52,8 @@ Foswiki is released under the GNU General Public License.
    * Foswiki 2.0.3 was built on 15 Nov 2015. It is a release that contains 17 fixes and 1 enhancement.
 %ENDTWISTY{}%
    * Foswiki 2.1.0 was built on 02 Feb 2016. It is a release that contains 37 fixes and 14 enhancements. It closes 7 Feature Requests.
-   * Foswiki 2.1.1-RC1 was built on 08 Apr 2016. It is a release that contains 30 fixes and 20 enhancements.
+   * 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.
 
 
 ---++ Pre-installed Extensions
@@ -296,6 +297,10 @@ Foswiki thanks the Translators for their efforts.  If you are interesting in hel
 | [[%BUGS%/Item14042][Item14042]] | Add jquery-1.12.3 / jquery-2.2.3. |
 | [[%BUGS%/Item4992][Item4992]] | Work out how to translate Javascript strings. |
 
+---++ Foswiki Release 2.1.2 Details
+---+++ Fixes
+
+| [[%BUGS%/Item14061][Item14061]] | Non-admin users are unable to refresh the page cache using the =refresh= query param. It's silently ignored. |
 
 </noautolink>
 

diff --git a/core/lib/Foswiki.pm b/core/lib/Foswiki.pm
@@ -211,8 +211,8 @@ BEGIN {
 
     # DO NOT CHANGE THE FORMAT OF $VERSION.
     # Use $RELEASE for a descriptive version.
-    use version 0.77; $VERSION = version->declare('v2.1.0_002');
-    $RELEASE = 'Foswiki-2.1.1-RC2';
+    use version 0.77; $VERSION = version->declare('v2.1.2');
+    $RELEASE = 'Foswiki-2.1.2';
 
     # Default handlers for different %TAGS%
     # Where an entry is set as 'undef', the tag will be demand-loaded