aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-05-30 10:08:13 +0200
committerMario Vavti <mario@mariovavti.com>2016-05-30 10:08:13 +0200
commit6d4adfcedccb041283949412b4adccf85d42a9f8 (patch)
tree86f19e227325270f3a25707f16355c6985c18f20
parentcac6cef4952e6535788c1c6db8ef1e58e88536a0 (diff)
parentf2ebe41a509d6e7f332fdc4cb43d14d555375bdf (diff)
downloadvolse-hubzilla-6d4adfcedccb041283949412b4adccf85d42a9f8.tar.gz
volse-hubzilla-6d4adfcedccb041283949412b4adccf85d42a9f8.tar.bz2
volse-hubzilla-6d4adfcedccb041283949412b4adccf85d42a9f8.zip
Merge branch 'dev' into sabre32
-rw-r--r--Zotlabs/Module/Cover_photo.php2
-rw-r--r--Zotlabs/Module/Setup.php4
-rwxr-xr-xboot.php2
-rw-r--r--include/import.php2
-rw-r--r--install/INSTALL.txt2
5 files changed, 7 insertions, 5 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);
}
diff --git a/boot.php b/boot.php
index fec908ce0..a882be2eb 100755
--- a/boot.php
+++ b/boot.php
@@ -1803,7 +1803,7 @@ function local_user() {
function remote_channel() {
if(session_id()
&& array_key_exists('authenticated',$_SESSION) && $_SESSION['authenticated']
- && array_key_exists('visitor_id',$_SESSION) && intval($_SESSION['visitor_id']))
+ && array_key_exists('visitor_id',$_SESSION) && $_SESSION['visitor_id'])
return $_SESSION['visitor_id'];
return false;
diff --git a/include/import.php b/include/import.php
index a94c6c1ac..132306621 100644
--- a/include/import.php
+++ b/include/import.php
@@ -20,6 +20,8 @@ function import_channel($channel, $account_id, $seize) {
dbesc($channel['channel_hash']),
dbesc($channel['channel_address'])
);
+ if($r && $r[0]['channel_guid'] == $channel['channel_guid'] && $r[0]['channel_pubkey'] === $channel['channel_pubkey'] && $r[0]['channel_hash'] === $channel['channel_hash'])
+ return $r[0];
if(($r) || (check_webbie(array($channel['channel_address'])) !== $channel['channel_address'])) {
if($r[0]['channel_guid'] === $channel['channel_guid'] || $r[0]['channel_hash'] === $channel['channel_hash']) {
diff --git a/install/INSTALL.txt b/install/INSTALL.txt
index 50d755f0f..670ad5af5 100644
--- a/install/INSTALL.txt
+++ b/install/INSTALL.txt
@@ -77,7 +77,7 @@ but may be an issue with nginx or other web server platforms.
Example config scripts are available for these platforms in doc/install.
Apache and nginx have the most support.
- - PHP 5.4 or later. The later the better.
+ - PHP 5.5 or later.
- PHP *command line* access with register_argc_argv set to true in the
php.ini file - and with no hosting provider restrictions on the use of