merging RT 4.0.6

1 files changed, 9 insertions, 2 deletions

diff --git a/rt/share/html/Install/Basics.html b/rt/share/html/Install/Basics.html
index d3e0a3ea0..6b5522431 100644
--- a/rt/share/html/Install/Basics.html
+++ b/rt/share/html/Install/Basics.html
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -81,9 +81,16 @@ if ( $Run ) {
         push @errors, loc("Invalid [_1]: it should be a number", 'WebPort');
     }
 
-    unless ( $ARGS{Password} ) {
+    if ( !$ARGS{Password} ) {
         push @errors, loc("You must enter an Administrative password");
     }
+    else {
+        my $dummy_user = RT::User->new($session{CurrentUser});
+        my ($ok, $msg) = $dummy_user->ValidatePassword($ARGS{Password});
+        unless ($ok) {
+            push @errors, $msg;
+        }
+    }
 
     if ( $Back ) {
         RT::Interface::Web::Redirect(RT->Config->Get('WebURL') .