Merge branch 'master' of github.com:danReynolds/SummonerExpert

danReynolds · Mar 30, 2018 · f29f06b · f29f06b
2 parents 63cb529 + 1b85f2d
commit f29f06b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/controllers/summoners_controller.rb b/app/controllers/summoners_controller.rb
@@ -583,7 +583,7 @@ def load_summoner
       id = RiotApi::get_summoner_id(name: name)
       if id
         @summoner = Summoner.find_by_summoner_id(id)
-        @summoner.name = name
+        @summoner.name = name if @summoner
       end
     end
 

diff --git a/lib/riot_api.rb b/lib/riot_api.rb
@@ -165,7 +165,7 @@ def get_summoner_queues(args)
 
       def get_summoner_id(args)
         name = URI.encode(args[:name])
-        url = replace_url(@api[:summoner][:id], args)
+        url = replace_url(@api[:summoner][:id], args.merge(name: name))
         return unless response = fetch_response(url)
         response['id']
       end