projects
/
phpfspot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wrong argument to get_mime_info function
[phpfspot.git]
/
phpfspot.class.php
diff --git
a/phpfspot.class.php
b/phpfspot.class.php
index 97deb968dacb5b6b98dd967d73a379480f4bf21d..eba23ca42cb0dbf8f6588c7efb3d17ddacb8dc1a 100644
(file)
--- a/
phpfspot.class.php
+++ b/
phpfspot.class.php
@@
-1610,7
+1610,7
@@
class PHPFSPOT {
*/
public function get_meta_informations($file)
{
*/
public function get_meta_informations($file)
{
- return exif_read_data($file);
+ return
@
exif_read_data($file);
} // get_meta_informations()
} // get_meta_informations()
@@
-2620,12
+2620,12
@@
class PHPFSPOT {
pt.tag_id LIKE '". $tagidx ."'
";
pt.tag_id LIKE '". $tagidx ."'
";
- if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) {
+
/*
if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) {
$query_str.= "
AND
t.name IN ('".implode("','",$this->cfg->show_tags)."')
";
$query_str.= "
AND
t.name IN ('".implode("','",$this->cfg->show_tags)."')
";
- }
+ }
*/
$result = $this->db->db_query($query_str);
$result = $this->db->db_query($query_str);
@@
-3004,7
+3004,7
@@
class PHPFSPOT {
*/
public function get_mime_info($file)
{
*/
public function get_mime_info($file)
{
- $details = getimagesize($
orig_imag
e);
+ $details = getimagesize($
fil
e);
/* if getimagesize() returns empty, try at least to find out the
mime type.
/* if getimagesize() returns empty, try at least to find out the
mime type.