Improve dba::selectFirst calls #4206
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
January 11, 2018 03:43
- Fix remaining $r[0] references - Rename $r to meaningful names
MrPetovan
force-pushed
the
task/fix-scrutinizer-issues
branch
from
155c473
to
ed2ac8d
Compare
|
Is it some urgent bugfix or has it time to be reviewed this evening (European time)? |
|
It has some bug fixes but nobody complained so far, so we're good on the time frame. |
annando
approved these changes
Jan 11, 2018
| @@ -185,11 +184,11 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) | |||
| INNER JOIN `user` ON `profile`.`uid` = `user`.`uid` | |||
| WHERE `user`.`nickname` = ? AND `profile`.`id` = ? LIMIT 1", | |||
| $nickname, | |||
| $profile_int | |||
| intval($profile_id) | |||
There was a problem hiding this comment.
This intval is superfluous.
| if (DBM::is_result($r)) { | ||
| $convid = $r['id']; | ||
| if (dba::insert('conv', $fields)) { | ||
| $convid = dba::lastInsertId(); |
There was a problem hiding this comment.
That's much too easy using that function ;-)
There was a problem hiding this comment.
I know right! Programming should only about pain and suffering!
| @@ -596,12 +596,12 @@ function networkThreadedView(App $a, $update = 0) { | |||
| 'allow_location' => $a->user['allow_location'], | |||
| 'default_location' => $a->user['default-location'], | |||
| 'nickname' => $a->user['nickname'], | |||
| 'lockstate'=> ((($group) || ($cid) || ($nets) || (is_array($a->user) && | |||
| 'lockstate'=> ((($gid) || ($cid) || ($nets) || (is_array($a->user) && | |||
There was a problem hiding this comment.
You could have removed some of the brackets :-)
This was referenced Jan 12, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Part of #4176
While doing #4205, I realized that some calls to
dba::selectFirstweren't cleanly done. I was able to find some remaining references to the previous$r[0]record.I decided to go on a mgical journey, and visit all current
dba::selectFirst()calls and either improve the legibility by renaming the return variable or fixing an eventual forgotten reference.