Jack Phoenix has submitted this change and it was merged.
Change subject: Remove use of DatabaseBase::strencode()
......................................................................
Remove use of DatabaseBase::strencode()
Change-Id: Ia3eecce64080ddbc026595ee649980ee2687ad2d
---
M PollClass.php
M SpecialViewPoll.php
2 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/PollClass.php b/PollClass.php
index c29ae1a..6489dd1 100644
--- a/PollClass.php
+++ b/PollClass.php
@@ -283,7 +283,7 @@
$randstr = wfRandom();
$sql = "SELECT poll_page_id FROM {$dbr->tableName(
'poll_question' )} {$use_index}
INNER JOIN {$dbr->tableName( 'page' )} ON
page_id=poll_page_id WHERE poll_id NOT IN
- (SELECT pv_poll_id FROM {$dbr->tableName(
'poll_user_vote' )} WHERE pv_user_name = '" . $dbr->strencode( $user_name ) .
"')
+ (SELECT pv_poll_id FROM {$dbr->tableName(
'poll_user_vote' )} WHERE pv_user_name = {$dbr->addQuotes( $user_name )})
AND poll_status=1 AND poll_random>$randstr
ORDER BY poll_random LIMIT 0,1";
$res = $dbr->query( $sql, __METHOD__ );
$row = $dbr->fetchObject( $res );
@@ -291,7 +291,7 @@
if( !$row ) {
$sql = "SELECT poll_page_id FROM {$dbr->tableName(
'poll_question' )} {$use_index}
INNER JOIN {$dbr->tableName( 'page' )} ON
page_id=poll_page_id WHERE poll_id NOT IN
- (SELECT pv_poll_id FROM
{$dbr->tableName( 'poll_user_vote' )} WHERE pv_user_name = '" .
$dbr->strencode( $user_name ) . "')
+ (SELECT pv_poll_id FROM
{$dbr->tableName( 'poll_user_vote' )} WHERE pv_user_name = {$dbr->addQuotes(
$user_name )})
AND poll_status=1 AND
poll_random<$randstr ORDER BY poll_random LIMIT 0,1";
wfDebugLog( 'PollNY', $sql );
$res = $dbr->query( $sql, __METHOD__ );
@@ -424,4 +424,4 @@
return $timeStr;
}
-}
\ No newline at end of file
+}
diff --git a/SpecialViewPoll.php b/SpecialViewPoll.php
index 94b6d9a..d172dee 100644
--- a/SpecialViewPoll.php
+++ b/SpecialViewPoll.php
@@ -72,7 +72,7 @@
$user = $request->getVal( 'user' );
$userLink = array();
if ( $user ) {
- $where['poll_user_name'] = $dbr->strencode( $user );
+ $where['poll_user_name'] = $user;
$userLink['user'] = $user;
}
@@ -122,7 +122,7 @@
$res_total = $dbr->select(
'poll_question',
'COUNT(*) AS total_polls',
- ( ( $user ) ? array( 'poll_user_name' =>
$dbr->strencode( $user ) ) : array() ),
+ ( ( $user ) ? array( 'poll_user_name' => $user ) :
array() ),
__METHOD__
);
$row_total = $dbr->fetchObject( $res_total );
@@ -244,4 +244,4 @@
$out->addHTML( $output );
}
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/189309
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3eecce64080ddbc026595ee649980ee2687ad2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PollNY
Gerrit-Branch: master
Gerrit-Owner: PleaseStand <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: PleaseStand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
