summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-08-27 20:23:31 -0700
committerEvan Prodromou <evan@status.net>2009-08-27 20:23:31 -0700
commitc0d03fc2799c7b0c57d05166b404a3d13427f497 (patch)
treef7e606d095eb3d7766d78c82a7b7217e8e7c775b /lib
parent34ce75c71d37754fa941233c805c042a47910184 (diff)
make URL analyzer save new info on URLs0.8.1rc2
Diffstat (limited to 'lib')
-rw-r--r--lib/util.php21
1 files changed, 13 insertions, 8 deletions
diff --git a/lib/util.php b/lib/util.php
index 070b4232c..8a56be55d 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -520,7 +520,7 @@ function common_linkify($url) {
// functions
$url = htmlspecialchars_decode($url);
- if(strpos($url, '@')!==false && strpos($url, ':')===false){
+ if(strpos($url, '@') !== false && strpos($url, ':') === false) {
//url is an email address without the mailto: protocol
return XMLStringer::estring('a', array('href' => "mailto:$url", 'rel' => 'external'), $url);
}
@@ -544,19 +544,24 @@ function common_linkify($url) {
// Check to see whether this is a known "attachment" URL.
- $localfile = File::staticGet('url', $longurl);
+ $f = File::staticGet('url', $longurl);
- if (!empty($localfile)) {
- if (isset($localfile->filename)) {
+ if (empty($f)) {
+ // XXX: this writes to the database. :<
+ $f = File::processNew($longurl);
+ }
+
+ if (!empty($f)) {
+ if (isset($f->filename)) {
$is_attachment = true;
- $attachment_id = $localfile->id;
+ $attachment_id = $f->id;
} else { // if it has OEmbed info, it's an attachment, too
- $foe = File_oembed::staticGet('file_id', $localfile->id);
+ $foe = File_oembed::staticGet('file_id', $f->id);
if (!empty($foe)) {
$is_attachment = true;
- $attachment_id = $localfile->id;
+ $attachment_id = $f->id;
- $thumb = File_thumbnail::staticGet('file_id', $localfile->id);
+ $thumb = File_thumbnail::staticGet('file_id', $f->id);
if (!empty($thumb)) {
$has_thumb = true;
}