diff options
| author | Mario Vavti <mario@mariovavti.com> | 2024-01-01 21:21:04 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2024-01-01 21:21:04 +0100 |
| commit | 9e2a253ddaf4d114bbfb5a1ad80f8790f4feadd9 (patch) | |
| tree | ec69eb97c566eb7816d95348f53a04ba1f4f2f5b /Zotlabs | |
| parent | b629eb56578e1d83662aeec3be5a31457654e27d (diff) | |
| parent | f2f9cfaf28508f66c1e948e7d1a9bf6b0c637d9d (diff) | |
| download | volse-hubzilla-9e2a253ddaf4d114bbfb5a1ad80f8790f4feadd9.tar.gz volse-hubzilla-9e2a253ddaf4d114bbfb5a1ad80f8790f4feadd9.tar.bz2 volse-hubzilla-9e2a253ddaf4d114bbfb5a1ad80f8790f4feadd9.zip | |
Merge branch 'dev'
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Lib/Config.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Photo/PhotoGd.php | 6 | ||||
| -rw-r--r-- | Zotlabs/Text/Tagadelic.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Zot6/Receiver.php | 1 |
4 files changed, 6 insertions, 7 deletions
diff --git a/Zotlabs/Lib/Config.php b/Zotlabs/Lib/Config.php index 5e735be34..933f4bff3 100644 --- a/Zotlabs/Lib/Config.php +++ b/Zotlabs/Lib/Config.php @@ -51,8 +51,6 @@ class Config { } App::$config[$family]['config_loaded'] = true; } - - } } diff --git a/Zotlabs/Photo/PhotoGd.php b/Zotlabs/Photo/PhotoGd.php index c54fa6a7d..6854be0ab 100644 --- a/Zotlabs/Photo/PhotoGd.php +++ b/Zotlabs/Photo/PhotoGd.php @@ -17,11 +17,11 @@ class PhotoGd extends PhotoDriver { $t = []; $t['image/jpeg'] = 'jpg'; - if(imagetypes() & IMG_PNG) + if(\imagetypes() & IMG_PNG) $t['image/png'] = 'png'; - if(imagetypes() & IMG_GIF) + if(\imagetypes() & IMG_GIF) $t['image/gif'] = 'gif'; - if(imagetypes() & IMG_WEBP) + if(\imagetypes() & IMG_WEBP) $t['image/webp'] = 'webp'; return $t; diff --git a/Zotlabs/Text/Tagadelic.php b/Zotlabs/Text/Tagadelic.php index 55ecf2d75..b96b60d3e 100644 --- a/Zotlabs/Text/Tagadelic.php +++ b/Zotlabs/Text/Tagadelic.php @@ -24,7 +24,7 @@ class Tagadelic { $x ++; } - usort($tags,'self::tags_sort'); + usort($tags, [self::class, 'tags_sort']); $range = max(.01, $max - $min) * 1.0001; @@ -41,4 +41,4 @@ class Tagadelic { return((strtolower($a[0]) < strtolower($b[0])) ? -1 : 1); } -}
\ No newline at end of file +} diff --git a/Zotlabs/Zot6/Receiver.php b/Zotlabs/Zot6/Receiver.php index b276cbe31..feaef4c9a 100644 --- a/Zotlabs/Zot6/Receiver.php +++ b/Zotlabs/Zot6/Receiver.php @@ -22,6 +22,7 @@ class Receiver { protected $prvkey; protected $rawdata; protected $sigdata; + protected $hub; function __construct($handler, $localdata = null) { |