Item13322: Defer the onSave call until after -set

The onSave handler should only be called after all -set processing has
been applied to the configuration. Otherwise it has an incomplete view
of the configuration.

core/lib/Foswiki/Configure/Wizards/Save.pm

@@ -232,18 +232,6 @@ sub save {
         while ( my ( $k, $v ) = each %{ $this->param('set') } ) {
             my $spec = $root->getValueObject($k);
 
-            # If ONSAVE checking is specified, call the checker's onSave()
-            # routine.  This could provide "cleanup" processing for example,
-            # when a configuration value is saved.  It can modify the value
-            # being saved, such as to hash a password, but never modify other
-            # values.
-            if ( $spec && $spec->{ONSAVE} ) {
-                my $checker = Foswiki::Configure::Checker::loadChecker($spec);
-                if ( $checker && $checker->can('onSave') ) {
-                    $checker->onSave( $reporter, $k, $v );
-                }
-            }
-
             if ( defined $v ) {
                 $v =~ m/^(.*)$/s;
                 $v = $1;    # untaint
@@ -277,6 +265,24 @@ sub save {
             }
             ASSERT( !$@, $@ ) if DEBUG;
         }
+
+        # Second pass after processing all the -set parameters
+        # To do the onsave, procesing
+        while ( my ( $k, $v ) = each %{ $this->param('set') } ) {
+            my $spec = $root->getValueObject($k);
+
+            # If ONSAVE checking is specified, call the checker's onSave()
+            # routine.  This could provide "cleanup" processing for example,
+            # when a configuration value is saved.  It can modify the value
+            # being saved, such as to hash a password, but never modify other
+            # values.
+            if ( $spec && $spec->{ONSAVE} ) {
+                my $checker = Foswiki::Configure::Checker::loadChecker($spec);
+                if ( $checker && $checker->can('onSave') ) {
+                    $checker->onSave( $reporter, $k, $v );
+                }
+            }
+        }
     }
 
     delete $Foswiki::cfg{ConfigurationFinished};