Replace x() by !empty() or defaults()
- Remove extraneous parentheses around !empty()
This commit is contained in:
@@ -136,7 +136,7 @@ class Diaspora_Connection {
|
||||
} elseif (!empty($m[1])) {
|
||||
$token = $m[1];
|
||||
}
|
||||
return (!empty($token)) ? $token : false;
|
||||
return !empty($token) ? $token : false;
|
||||
}
|
||||
|
||||
private function readJsonResponse($response) {
|
||||
@@ -165,14 +165,14 @@ class Diaspora_Connection {
|
||||
$this->doHttpRequest('/bookmarklet');
|
||||
$m = [];
|
||||
preg_match('/"aspects"\:(\[.+?\])/', $this->last_http_result->response, $m);
|
||||
return (!empty($m[1])) ? json_decode($m[1]) : false;
|
||||
return !empty($m[1]) ? json_decode($m[1]) : false;
|
||||
}
|
||||
|
||||
public function getServices() {
|
||||
$this->doHttpRequest('/bookmarklet');
|
||||
$m = [];
|
||||
preg_match('/"configured_services"\:(\[.+?\])/', $this->last_http_result->response, $m);
|
||||
return (!empty($m[1])) ? json_decode($m[1]) : false;
|
||||
return !empty($m[1]) ? json_decode($m[1]) : false;
|
||||
}
|
||||
|
||||
public function getNotifications($notification_type = '', $show = '') {
|
||||
|
||||
@@ -286,7 +286,7 @@ function diaspora_post_local(App $a, array &$b)
|
||||
|
||||
$diaspora_post = intval(PConfig::get(local_user(),'diaspora','post'));
|
||||
|
||||
$diaspora_enable = (($diaspora_post && x($_REQUEST,'diaspora_enable')) ? intval($_REQUEST['diaspora_enable']) : 0);
|
||||
$diaspora_enable = (($diaspora_post && !empty($_REQUEST['diaspora_enable'])) ? intval($_REQUEST['diaspora_enable']) : 0);
|
||||
|
||||
if ($b['api_source'] && intval(PConfig::get(local_user(),'diaspora','post_by_default'))) {
|
||||
$diaspora_enable = 1;
|
||||
|
||||
Reference in New Issue
Block a user