define('FRIENDICA_PLATFORM', 'Friendica');
define('FRIENDICA_CODENAME', 'Asparagus');
-define('FRIENDICA_VERSION', '3.6-dev');
+define('FRIENDICA_VERSION', '3.6-rc');
define('DFRN_PROTOCOL_VERSION', '2.23');
-define('DB_UPDATE_VERSION', 1250);
+define('DB_UPDATE_VERSION', 1255);
define('NEW_UPDATE_ROUTINE_VERSION', 1170);
/**
if (empty($build)) {
Config::set('system', 'build', DB_UPDATE_VERSION - 1);
- $build = DB_UPDATE_VERSION;
+ $build = DB_UPDATE_VERSION - 1;
}
// We don't support upgrading from very old versions anymore
die('You try to update from a version prior to database version 1170. The direct upgrade path is not supported. Please update to version 3.5.4 before updating to this version.');
}
- if ($build != DB_UPDATE_VERSION) {
+ if ($build < DB_UPDATE_VERSION) {
// When we cannot execute the database update via the worker, we will do it directly
if (!Worker::add(PRIORITY_CRITICAL, 'DBUpdate') && $via_worker) {
update_db();
return;
}
-function get_guid($size = 16, $prefix = "")
+function get_guid($size = 16, $prefix = '')
{
- if ($prefix == "") {
+ if (is_bool($prefix) && !$prefix) {
+ $prefix = '';
+ } elseif ($prefix == '') {
$a = get_app();
- $prefix = hash("crc32", $a->get_hostname());
+ $prefix = hash('crc32', $a->get_hostname());
}
while (strlen($prefix) < ($size - 13)) {
if ($size >= 24) {
$prefix = substr($prefix, 0, $size - 22);
- return(str_replace(".", "", uniqid($prefix, true)));
+ return str_replace('.', '', uniqid($prefix, true));
} else {
$prefix = substr($prefix, 0, max($size - 13, 0));
- return(uniqid($prefix));
+ return uniqid($prefix);
}
}
if (!$public_contact_id && x($_SESSION, 'authenticated')) {
if (x($_SESSION, 'my_address')) {
// Local user
- $public_contact_id = intval(Contact::getIdForURL($_SESSION['my_address'], 0));
+ $public_contact_id = intval(Contact::getIdForURL($_SESSION['my_address'], 0, true));
} elseif (x($_SESSION, 'visitor_home')) {
// Remote user
- $public_contact_id = intval(Contact::getIdForURL($_SESSION['visitor_home'], 0));
+ $public_contact_id = intval(Contact::getIdForURL($_SESSION['visitor_home'], 0, true));
}
} elseif (!x($_SESSION, 'authenticated')) {
$public_contact_id = false;