From 023b9e3662a590b2b8ecb685d4e4eafb8a327964 Mon Sep 17 00:00:00 2001 From: Richard Fairhurst Date: Thu, 26 Mar 2009 09:38:11 +0000 Subject: [PATCH 1/1] fix user:pass auth for Potlatch --- app/controllers/amf_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb index febc4db68..03d952b96 100644 --- a/app/controllers/amf_controller.rb +++ b/app/controllers/amf_controller.rb @@ -524,10 +524,10 @@ class AmfController < ApplicationController end # Authenticate token - # (could be removed if no-one uses the username+password form) + # (can also be of form user:pass) def getuserid(token) #:doc: - if (token =~ /^(.+)\+(.+)$/) then + if (token =~ /^(.+)\:(.+)$/) then user = User.authenticate(:username => $1, :password => $2) else user = User.authenticate(:token => token) -- 2.39.5