fix error for chinese url join
This commit is contained in:
parent
eddb6f0d53
commit
9fd98b7888
|
@ -235,7 +235,7 @@ class SiteFeedAnnc
|
||||||
|
|
||||||
|
|
||||||
if !tmp["link_to_show"].blank? && tmp["link_to_show"].start_with?("/")
|
if !tmp["link_to_show"].blank? && tmp["link_to_show"].start_with?("/")
|
||||||
tmp["link_to_show"] = "#{tmp["source_url"]}#{tmp["link_to_show"])}"
|
tmp["link_to_show"] = "#{tmp["source_url"]}#{tmp["link_to_show"]}"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
@ -382,8 +382,8 @@ class SiteFeedAnnc
|
||||||
end
|
end
|
||||||
if tmp["link_to_show"].nil?
|
if tmp["link_to_show"].nil?
|
||||||
tmp["link_to_show"] = UseSourceUrl && tmp["show_url"] ?
|
tmp["link_to_show"] = UseSourceUrl && tmp["show_url"] ?
|
||||||
URI.join("#{tmp["source_url"]}/#{locale}",URI.encode("#{tmp["show_url"]}")).to_s :
|
"#{tmp["source_url"]}/#{locale}#{tmp["show_url"]}" :
|
||||||
is_widget ? OrbitHelper.widget_item_url(tmp["params"]) : OrbitHelper.url_to_show(tmp["params"])
|
is_widget ? OrbitHelper.widget_item_url(tmp["params"]) : OrbitHelper.url_to_show(tmp["params"])
|
||||||
end
|
end
|
||||||
tmp
|
tmp
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue