diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-05-30 10:08:13 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-05-30 10:08:13 +0200 |
| commit | 6d4adfcedccb041283949412b4adccf85d42a9f8 (patch) | |
| tree | 86f19e227325270f3a25707f16355c6985c18f20 /Zotlabs | |
| parent | cac6cef4952e6535788c1c6db8ef1e58e88536a0 (diff) | |
| parent | f2ebe41a509d6e7f332fdc4cb43d14d555375bdf (diff) | |
| download | volse-hubzilla-6d4adfcedccb041283949412b4adccf85d42a9f8.tar.gz volse-hubzilla-6d4adfcedccb041283949412b4adccf85d42a9f8.tar.bz2 volse-hubzilla-6d4adfcedccb041283949412b4adccf85d42a9f8.zip | |
Merge branch 'dev' into sabre32
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Cover_photo.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Setup.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Module/Cover_photo.php b/Zotlabs/Module/Cover_photo.php index 2e53696ff..371713c8d 100644 --- a/Zotlabs/Module/Cover_photo.php +++ b/Zotlabs/Module/Cover_photo.php @@ -341,7 +341,7 @@ class Cover_photo extends \Zotlabs\Web\Controller { } } - cover_photo_crop_ui_head($a, $ph, $hash, $smallest); + $this->cover_photo_crop_ui_head($a, $ph, $hash, $smallest); } diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php index 447f46ed6..c4878e217 100644 --- a/Zotlabs/Module/Setup.php +++ b/Zotlabs/Module/Setup.php @@ -384,8 +384,8 @@ class Setup extends \Zotlabs\Web\Controller { function check_php(&$phpath, &$checks) { $help = ''; - if(version_compare(PHP_VERSION, '5.4') < 0) { - $help .= t('PHP version 5.4 or greater is required.'); + if(version_compare(PHP_VERSION, '5.5') < 0) { + $help .= t('PHP version 5.5 or greater is required.'); $this->check_add($checks, t('PHP version'), false, false, $help); } |