aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/Photo.php7
-rw-r--r--include/items.php2
2 files changed, 8 insertions, 1 deletions
diff --git a/include/Photo.php b/include/Photo.php
index 0f5003a6f..e418cde46 100644
--- a/include/Photo.php
+++ b/include/Photo.php
@@ -6,12 +6,15 @@ class Photo {
private $image;
private $width;
private $height;
+ private $valid;
public function __construct($data) {
+ $this->valid = false;
$this->image = @imagecreatefromstring($data);
if($this->image !== FALSE) {
$this->width = imagesx($this->image);
$this->height = imagesy($this->image);
+ $this->valid = true;
}
}
@@ -20,6 +23,10 @@ class Photo {
imagedestroy($this->image);
}
+ public function is_valid() {
+ return $this->valid;
+ }
+
public function getWidth() {
return $this->width;
}
diff --git a/include/items.php b/include/items.php
index ac4e694be..799af48ac 100644
--- a/include/items.php
+++ b/include/items.php
@@ -633,7 +633,7 @@ function consume_feed($xml,$importer,$contact, &$hub) {
$resource_id = $r[0]['resource-id'];
$img_str = fetch_url($photo_url,true);
$img = new Photo($img_str);
- if($img) {
+ if($img->is_valid()) {
q("DELETE FROM `photo` WHERE `resource-id` = '%s' AND contact-id` = %d AND `uid` = %d",
dbesc($resource_id),
intval($contact['id']),