mirror of
https://github.com/codeninjasllc/discourse.git
synced 2024-11-27 09:36:19 -05:00
correct logic in importer
This commit is contained in:
parent
a1f02d4baa
commit
02a38eebbb
1 changed files with 4 additions and 1 deletions
|
@ -763,7 +763,7 @@ SQL
|
|||
if l["href"]
|
||||
l["href"] = uri.path
|
||||
# we have an internal link, lets see if we can remap it?
|
||||
permalink = Permalink.find_by_url(uri.path)
|
||||
permalink = Permalink.find_by_url(uri.path) rescue nil
|
||||
if l["href"] && permalink && permalink.target_url
|
||||
l["href"] = permalink.target_url
|
||||
end
|
||||
|
@ -774,12 +774,15 @@ SQL
|
|||
if upload_name
|
||||
png = UPLOAD_DIR + "/" + upload_name + ".png"
|
||||
jpg = UPLOAD_DIR + "/" + upload_name + ".jpg"
|
||||
gif = UPLOAD_DIR + "/" + upload_name + ".gif"
|
||||
|
||||
# check to see if we have it
|
||||
if File.exist?(png)
|
||||
image = png
|
||||
elsif File.exists?(jpg)
|
||||
image = jpg
|
||||
elsif File.exists?(gif)
|
||||
image = gif
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue