summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-03-18 20:57:38 -0500
committerEvan Prodromou <evan@status.net>2010-03-18 20:57:38 -0500
commitac609e804078cf70fcc02b36aa1eb40115354715 (patch)
treec206723a0fe28fd62f8d2838f589a42ec7523af5 /lib
parent17c50f338ceb574780476f6b788f48e2d7d06017 (diff)
parent4a6c9e445149e42a4f81d5140296e7770c60bc6c (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Conflicts: plugins/OStatus/extlib/hkit/hkit.class.php plugins/OStatus/lib/discoveryhints.php
Diffstat (limited to 'lib')
-rw-r--r--lib/activity.php4
-rw-r--r--lib/imagefile.php9
2 files changed, 2 insertions, 11 deletions
diff --git a/lib/activity.php b/lib/activity.php
index d84eabf7c..c67d090f7 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -720,7 +720,7 @@ class ActivityObject
}
}
- static function fromNotice($notice)
+ static function fromNotice(Notice $notice)
{
$object = new ActivityObject();
@@ -734,7 +734,7 @@ class ActivityObject
return $object;
}
- static function fromProfile($profile)
+ static function fromProfile(Profile $profile)
{
$object = new ActivityObject();
diff --git a/lib/imagefile.php b/lib/imagefile.php
index 2134623b1..e47287741 100644
--- a/lib/imagefile.php
+++ b/lib/imagefile.php
@@ -67,10 +67,8 @@ class ImageFile
$info[2] == IMAGETYPE_BMP ||
($info[2] == IMAGETYPE_WBMP && function_exists('imagecreatefromwbmp')) ||
($info[2] == IMAGETYPE_XBM && function_exists('imagecreatefromxbm')) ||
- ($info[2] == IMAGETYPE_XPM && function_exists('imagecreatefromxpm')) ||
($info[2] == IMAGETYPE_PNG && function_exists('imagecreatefrompng')))) {
- @unlink($_FILES[$param]['tmp_name']);
throw new Exception(_('Unsupported image file format.'));
return;
}
@@ -161,9 +159,6 @@ class ImageFile
case IMAGETYPE_XBM:
$image_src = imagecreatefromxbm($this->filepath);
break;
- case IMAGETYPE_XPM:
- $image_src = imagecreatefromxpm($this->filepath);
- break;
default:
throw new Exception(_('Unknown file type'));
return;
@@ -206,10 +201,6 @@ class ImageFile
//we don't want to save XBM... it's a rare format that we can't guarantee clients will support
//save png instead
$this->type = IMAGETYPE_PNG;
- } else if($this->type == IMAGETYPE_XPM) {
- //we don't want to save XPM... it's a rare format that we can't guarantee clients will support
- //save png instead
- $this->type = IMAGETYPE_PNG;
}
$outname = Avatar::filename($this->id,