nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #4021 from zeroadam/ConfigFalse

Browse source 
Update false evaluations
This commit is contained in:
Hypolite Petovan 2017-12-06 15:35:43 -05:00 committed by GitHub
parent 09d798ba77 71911a6989
commit b9387c0a63
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -742,7 +742,7 @@ function run_update_function($x)
// delete the config entry to try again.
$t = Config::get('database', 'update_' . $x);
if ($t !== false) {
if (!is_null($t)) {
return false;
}
Config::set('database', 'update_' . $x, time());

2
include/nav.php
View file

@ -209,7 +209,7 @@ function nav_info(App $a)
// Provide a banner/logo/whatever
$banner = Config::get('system', 'banner');
if ($banner === false) {
if (is_null($banner)) {
$banner = '<a href="https://friendi.ca"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="https://friendi.ca">Friendica</a></span>';
}

8
include/network.php
View file

@ -126,8 +126,8 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array())
if (x($opts, 'timeout')) {
@curl_setopt($ch, CURLOPT_TIMEOUT, $opts['timeout']);
} else {
$curl_time = intval(Config::get('system', 'curl_timeout'));
@curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60));
$curl_time = Config::get('system', 'curl_timeout', 60);
@curl_setopt($ch, CURLOPT_TIMEOUT, intval($curl_time));
}
// by default we will allow self-signed certs
@ -302,8 +302,8 @@ function post_url($url, $params, $headers = null, &$redirects = 0, $timeout = 0)
if (intval($timeout)) {
curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
} else {
$curl_time = intval(Config::get('system', 'curl_timeout'));
curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60));
$curl_time = Config::get('system', 'curl_timeout', 60);
curl_setopt($ch, CURLOPT_TIMEOUT, intval($curl_time));
}
if (defined('LIGHTTPD')) {

2
src/Content/Feature.php
View file

@ -26,9 +26,11 @@ class Feature
if ($x === false) {
$x = PConfig::get($uid, 'feature', $feature, false);
}
if ($x === false) {
$x = Config::get('feature', $feature, false);
}
if ($x === false) {
$x = self::getDefault($feature);
}

2
src/Network/FKOAuthDataStore.php
View file

@ -171,7 +171,7 @@ class FKOAuthDataStore extends OAuthDataStore
dba::delete('tokens', array('id' => $token->key));
if (!is_null($ret) && $uverifier !== false) {
if (!is_null($ret) && !is_null($uverifier)) {
Config::delete("oauth", $verifier);
}

4
src/Worker/OnePoll.php
View file

@ -91,8 +91,8 @@ Class OnePoll
$t = $contact['last-update'];
if ($contact['subhub']) {
$poll_interval = Config::get('system', 'pushpoll_frequency');
$contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3);
$poll_interval = Config::get('system', 'pushpoll_frequency', 3);
$contact['priority'] = intval($poll_interval);
$hub_update = false;
if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 day")) {

4
view/theme/vier/theme.php
View file

@ -110,13 +110,13 @@ EOT;
function get_vier_config($key, $default = false, $admin = false) {
if (local_user() && !$admin) {
$result = PConfig::get(local_user(), "vier", $key);
if ($result !== false) {
if (!is_null($result)) {
return $result;
}
}
$result = Config::get("vier", $key);
if ($result !== false) {
if (!is_null($result)) {
return $result;
}