Merge branch 'Release02x01'

foswiki · Jun 26, 2016 · 8541bf7 · 8541bf7
2 parents d42e771 + a244064
commit 8541bf7
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/core/lib/Foswiki/UI/Register.pm b/core/lib/Foswiki/UI/Register.pm
@@ -134,6 +134,15 @@ sub _action_register {
         _requireConfirmation( $session, $data, 'Verification', 'confirm',
             $data->{Email} );
     }
+    elsif ( $Foswiki::cfg{Register}{NeedApproval} ) {
+        my $query = $session->{request};
+        my $data = _getDataFromQuery( $session->{users}, $query );
+        $data->{FirstLastName} = $data->{Name};
+        my $approvers = $Foswiki::cfg{Register}{Approvers}
+          || $Foswiki::cfg{AdminUserWikiName};
+        _requireConfirmation( $session, $data, 'Approval', 'approve',
+            $approvers );
+    }
     else {
 
         # No need for confirmation