Static methods should be called statically

This commit is contained in:
Michael 2017-10-21 16:13:25 +00:00
parent 2624abdc35
commit b513a597c8
2 changed files with 8 additions and 5 deletions

View file

@ -26,7 +26,7 @@ class Photo {
/** /**
* @brief supported mimetypes and corresponding file extensions * @brief supported mimetypes and corresponding file extensions
*/ */
static function supportedTypes() { static public function supportedTypes() {
if (class_exists('Imagick')) { if (class_exists('Imagick')) {
// Imagick::queryFormats won't help us a lot there... // Imagick::queryFormats won't help us a lot there...
@ -49,7 +49,7 @@ class Photo {
public function __construct($data, $type=null) { public function __construct($data, $type=null) {
$this->imagick = class_exists('Imagick'); $this->imagick = class_exists('Imagick');
$this->types = $this->supportedTypes(); $this->types = static::supportedTypes();
if (!array_key_exists($type, $this->types)){ if (!array_key_exists($type, $this->types)){
$type='image/jpeg'; $type='image/jpeg';
} }

View file

@ -202,13 +202,16 @@ function photo_init(App $a) {
if ($public and ($file != "")) { if ($public and ($file != "")) {
// If the photo path isn't there, try to create it // If the photo path isn't there, try to create it
$basepath = $a->get_basepath(); $basepath = $a->get_basepath();
if (!is_dir($basepath."/photo")) if (!is_dir($basepath."/photo")) {
if (is_writable($basepath)) if (is_writable($basepath)) {
mkdir($basepath."/photo"); mkdir($basepath."/photo");
}
}
if (is_dir($basepath."/photo")) if (is_dir($basepath."/photo")) {
file_put_contents($basepath."/photo/".$file, $data); file_put_contents($basepath."/photo/".$file, $data);
} }
}
killme(); killme();
// NOTREACHED // NOTREACHED