From ca6e4777016a71a3d3621ff3cbdc4cee8717a6b9 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 9 Jan 2018 22:27:30 -0500 Subject: [PATCH] Replace dba::select(limit => 1) by dba::selectOne() --- buffer/buffer.php | 2 +- diaspora/diaspora.php | 2 +- ifttt/ifttt.php | 2 +- libertree/libertree.php | 2 +- pumpio/pumpio.php | 2 +- statusnet/statusnet.php | 2 +- tumblr/tumblr.php | 2 +- twitter/twitter.php | 2 +- windowsphonepush/windowsphonepush.php | 2 +- wppost/wppost.php | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/buffer/buffer.php b/buffer/buffer.php index 97373f301..6ecfb1894 100644 --- a/buffer/buffer.php +++ b/buffer/buffer.php @@ -250,7 +250,7 @@ function buffer_send(App $a, &$b) // Dont't post if the post doesn't belong to us. // This is a check for forum postings - $self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1)); + $self = dba::selectOne('contact', ['id'], ['uid' => $b['uid'], 'self' => true]); if ($b['contact-id'] != $self['id']) { return; } diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php index 04ed24ca8..d2e2961dc 100644 --- a/diaspora/diaspora.php +++ b/diaspora/diaspora.php @@ -286,7 +286,7 @@ function diaspora_send(&$a,&$b) { // Dont't post if the post doesn't belong to us. // This is a check for forum postings - $self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1)); + $self = dba::selectOne('contact', ['id'], ['uid' => $b['uid'], 'self' => true]); if ($b['contact-id'] != $self['id']) { return; } diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php index 384b955c0..ad7a367b8 100644 --- a/ifttt/ifttt.php +++ b/ifttt/ifttt.php @@ -97,7 +97,7 @@ function ifttt_post(App $a) $nickname = $a->argv[1]; - $user = dba::select('user', ['uid'], ['nickname' => $nickname], ['limit' => 1]); + $user = dba::selectOne('user', ['uid'], ['nickname' => $nickname]); if (!DBM::is_result($user)) { logger('User ' . $nickname . ' not found.', LOGGER_DEBUG); return; diff --git a/libertree/libertree.php b/libertree/libertree.php index 95def07a0..f942bed3f 100644 --- a/libertree/libertree.php +++ b/libertree/libertree.php @@ -166,7 +166,7 @@ function libertree_send(&$a,&$b) { // Dont't post if the post doesn't belong to us. // This is a check for forum postings - $self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1)); + $self = dba::selectOne('contact', ['id'], ['uid' => $b['uid'], 'self' => true]); if ($b['contact-id'] != $self['id']) { return; } diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index f5bf6496a..52a48ae20 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -418,7 +418,7 @@ function pumpio_send(&$a,&$b) { // Dont't post if the post doesn't belong to us. // This is a check for forum postings - $self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1)); + $self = dba::selectOne('contact', ['id'], ['uid' => $b['uid'], 'self' => true]); if ($b['contact-id'] != $self['id']) { return; } diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index 659ddaef2..814722f45 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -580,7 +580,7 @@ function statusnet_post_hook(App $a, &$b) // Dont't post if the post doesn't belong to us. // This is a check for forum postings - $self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1)); + $self = dba::selectOne('contact', ['id'], ['uid' => $b['uid'], 'self' => true]); if ($b['contact-id'] != $self['id']) { return; } diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php index 77d98aca7..674093edf 100644 --- a/tumblr/tumblr.php +++ b/tumblr/tumblr.php @@ -327,7 +327,7 @@ function tumblr_send(&$a,&$b) { // Dont't post if the post doesn't belong to us. // This is a check for forum postings - $self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1)); + $self = dba::selectOne('contact', ['id'], ['uid' => $b['uid'], 'self' => true]); if ($b['contact-id'] != $self['id']) { return; } diff --git a/twitter/twitter.php b/twitter/twitter.php index 43aee0fef..e501a3442 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -468,7 +468,7 @@ function twitter_post_hook(App $a, &$b) // Dont't post if the post doesn't belong to us. // This is a check for forum postings - $self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1)); + $self = dba::selectOne('contact', ['id'], ['uid' => $b['uid'], 'self' => true]); if ($b['contact-id'] != $self['id']) { return; } diff --git a/windowsphonepush/windowsphonepush.php b/windowsphonepush/windowsphonepush.php index baa4c656e..c9d58bd7f 100644 --- a/windowsphonepush/windowsphonepush.php +++ b/windowsphonepush/windowsphonepush.php @@ -458,7 +458,7 @@ function windowsphonepush_login(App $a) $user_id = User::authenticate($_SERVER['PHP_AUTH_USER'], trim($_SERVER['PHP_AUTH_PW'])); if ($user_id) { - $record = dba::select('user', [], ['uid' => $user_id], ['limit' => 1]); + $record = dba::selectOne('user', [], ['uid' => $user_id]); } else { logger('API_login failure: ' . print_r($_SERVER, true), LOGGER_DEBUG); header('WWW-Authenticate: Basic realm="Friendica"'); diff --git a/wppost/wppost.php b/wppost/wppost.php index ea26ae453..d6daa8c06 100644 --- a/wppost/wppost.php +++ b/wppost/wppost.php @@ -202,7 +202,7 @@ function wppost_send(&$a,&$b) { // Dont't post if the post doesn't belong to us. // This is a check for forum postings - $self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1)); + $self = dba::selectOne('contact', ['id'], ['uid' => $b['uid'], 'self' => true]); if ($b['contact-id'] != $self['id']) { return; }