eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Fix some stupid bugs, such as a mispelling of oembed

Browse Source
This commit is contained in:
Craig Andrews 2009-08-26 21:51:54 -04:00
parent 6d60d74093
commit 504c42aa7d
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
classes/File.php
View File

@ -204,10 +204,8 @@ class File extends Memcached_DataObject
$enclosure->modified=$this->modified; $enclosure->modified=$this->modified;
$enclosure->size=$this->size; $enclosure->size=$this->size;
$enclosure->mimetype=$this->mimetype; $enclosure->mimetype=$this->mimetype;
if(isset($this->filename)){ if(! isset($this->filename)){
return $enclosure;
}else{
$notEnclosureMimeTypes = array('text/html','application/xhtml+xml'); $notEnclosureMimeTypes = array('text/html','application/xhtml+xml');
$mimetype = strtolower($this->mimetype); $mimetype = strtolower($this->mimetype);
$semicolon = strpos($mimetype,';'); $semicolon = strpos($mimetype,';');
@ -215,9 +213,9 @@ class File extends Memcached_DataObject
$mimetype = substr($mimetype,0,$semicolon); $mimetype = substr($mimetype,0,$semicolon);
} }
if(in_array($mimetype,$notEnclosureMimeTypes)){ if(in_array($mimetype,$notEnclosureMimeTypes)){
$ombed = File_oembed::staticGet('file_id',$this->id); $oembed = File_oembed::staticGet('file_id',$this->id);
if($oembed){ if($oembed){
$mimetype = strtolower($ombed->mimetype); $mimetype = strtolower($oembed->mimetype);
$semicolon = strpos($mimetype,';'); $semicolon = strpos($mimetype,';');
if($semicolon){ if($semicolon){
$mimetype = substr($mimetype,0,$semicolon); $mimetype = substr($mimetype,0,$semicolon);
@ -225,19 +223,16 @@ class File extends Memcached_DataObject
if(in_array($mimetype,$notEnclosureMimeTypes)){ if(in_array($mimetype,$notEnclosureMimeTypes)){
return false; return false;
}else{ }else{
if($ombed->mimetype) $enclosure->mimetype=$ombed->mimetype; if($oembed->mimetype) $enclosure->mimetype=$oembed->mimetype;
if($ombed->url) $enclosure->url=$ombed->url; if($oembed->url) $enclosure->url=$oembed->url;
if($ombed->title) $enclosure->title=$ombed->title; if($oembed->title) $enclosure->title=$oembed->title;
if($ombed->modified) $enclosure->modified=$ombed->modified; if($oembed->modified) $enclosure->modified=$oembed->modified;
unset($ombed->size); unset($oembed->size);
} }
}else{
return $enclosure;
} }
}else{
return $enclosure;
} }
} }
return $enclosure;
} }
} }