Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Incorrect string match

This commit is contained in:
Robin Ward 2014-01-14 15:38:12 -05:00
parent 71aed34e64
commit 9097368038
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/lib/url.js
View File

@ -99,7 +99,7 @@ Discourse.URL = Em.Object.createWithMixins({
if (url && url.length) { if (url && url.length) {
if (url.indexOf('/') === 0) { return true; } if (url.indexOf('/') === 0) { return true; }
if (url.indexOf(this.origin()) === 0) { return true; } if (url.indexOf(this.origin()) === 0) { return true; }
if (url.replace(/^http[^s]/, 'https').indexOf(this.origin()) === 0) { return true; } if (url.replace(/^http/, 'https').indexOf(this.origin()) === 0) { return true; }
if (url.replace(/^https/, 'http').indexOf(this.origin()) === 0) { return true; } if (url.replace(/^https/, 'http').indexOf(this.origin()) === 0) { return true; }
} }
return false; return false;

2
app/models/topic_link_click.rb
View File

@ -15,7 +15,7 @@ class TopicLinkClick < ActiveRecord::Base
if args[:url] =~ /^http/ if args[:url] =~ /^http/
http_url = args[:url].sub(/^https/, 'http') http_url = args[:url].sub(/^https/, 'http')
https_url = args[:url].sub(/^http[^s]/, 'https') https_url = args[:url].sub(/^http/, 'https')
link = TopicLink.select([:id, :user_id]).where('url = ? OR url = ?', http_url, https_url) link = TopicLink.select([:id, :user_id]).where('url = ? OR url = ?', http_url, https_url)
else else
link = TopicLink.select([:id, :user_id]).where(url: args[:url]) link = TopicLink.select([:id, :user_id]).where(url: args[:url])