Issue 4145: Make it not broken

sarken · Nov 3, 2014 · 8ce7309 · 8ce7309
1 parent 203f8b7
commit 8ce7309
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/controllers/user_sessions_controller.rb b/app/controllers/user_sessions_controller.rb
@@ -41,13 +41,13 @@ def create
 
               message = ts("Your account has been locked for 5 minutes due to too many failed login attempts.")
             else
-              message = ts("The password or user name you entered doesn't match our records. Please try again or follow the 'Forgot password?' link below.  If you still can't log in, please visit <a href="https://archiveofourown.org/admin_posts/1277">Problems When Logging In</a> for help.")
+              message = ts("The password or user name you entered doesn't match our records. Please try again or follow the 'Forgot password?' link below.  If you still can't log in, please visit <a href="http://archiveofourown.org/admin_posts/1277">Problems When Logging In</a> for help.".html_safe)
             end
           else
             message = ts("You'll need to activate your account before you can log in. Please check your email or contact support.")
           end
         else
-          message = ts("The password or user name you entered doesn't match our records. Please try again or follow the 'Forgot password?' link below.  If you still can't log in, please visit <a href="https://archiveofourown.org/admin_posts/1277">Problems When Logging In</a> for help.")
+          message = ts("The password or user name you entered doesn't match our records. Please try again or follow the 'Forgot password?' link below.  If you still can't log in, please visit <a href="http://archiveofourown.org/admin_posts/1277">Problems When Logging In</a> for help.".html_safe)
         end
         flash.now[:error] = message
         @user_session = UserSession.new(params[:user_session])

diff --git a/doc/app/UserSessionsController.html b/doc/app/UserSessionsController.html
@@ -708,13 +708,13 @@ <h3 class="section-header">Public Instance Methods</h3>
 
             <span class="ruby-identifier">message</span> = <span class="ruby-identifier">ts</span>(<span class="ruby-string">&quot;Your account has been locked for 5 minutes due to too many failed login attempts.&quot;</span>)
           <span class="ruby-keyword">else</span>
-            <span class="ruby-identifier">message</span> = <span class="ruby-identifier">ts</span>(<span class="ruby-string">&quot;The password or user name you entered doesn't match our records. Please try again or follow the 'Forgot password?' link below.  If you still can't log in, please visit <a href="https://archiveofourown.org/admin_posts/1277">Problems When Logging In</a> for help.&quot;</span>)
+            <span class="ruby-identifier">message</span> = <span class="ruby-identifier">ts</span>(<span class="ruby-string">&quot;The password or user name you entered doesn't match our records. Please try again or follow the 'Forgot password?' link below.  If you still can't log in, please visit <a href="http://archiveofourown.org/admin_posts/1277">Problems When Logging In</a> for help.&quot;</span>)
           <span class="ruby-keyword">end</span>
         <span class="ruby-keyword">else</span>
           <span class="ruby-identifier">message</span> = <span class="ruby-identifier">ts</span>(<span class="ruby-string">&quot;You'll need to activate your account before you can log in. Please check your email or contact support.&quot;</span>)
         <span class="ruby-keyword">end</span>
       <span class="ruby-keyword">else</span>
-        <span class="ruby-identifier">message</span> = <span class="ruby-identifier">ts</span>(<span class="ruby-string">&quot;The password or user name you entered doesn't match our records. Please try again or follow the 'Forgot password?' link below.  If you still can't log in, please visit <a href="https://archiveofourown.org/admin_posts/1277">Problems When Logging In</a> for help.&quot;</span>)
+        <span class="ruby-identifier">message</span> = <span class="ruby-identifier">ts</span>(<span class="ruby-string">&quot;The password or user name you entered doesn't match our records. Please try again or follow the 'Forgot password?' link below.  If you still can't log in, please visit <a href="http://archiveofourown.org/admin_posts/1277">Problems When Logging In</a> for help.&quot;</span>)
       <span class="ruby-keyword">end</span>
       <span class="ruby-identifier">setflash</span>; <span class="ruby-identifier">flash</span>.<span class="ruby-identifier">now</span>[<span class="ruby-value">:error</span>] = <span class="ruby-identifier">message</span>
       <span class="ruby-ivar">@user_session</span> = <span class="ruby-constant">UserSession</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">params</span>[<span class="ruby-value">:user_session</span>])