IAlex has uploaded a new change for review.
https://gerrit.wikimedia.org/r/135184
Change subject: Don't use isset() to check for null
......................................................................
Don't use isset() to check for null
Fixes in includes/specials
Change-Id: I6c382aeaa92372bc11220694c479006e3c658362
---
M includes/specials/SpecialAllpages.php
M includes/specials/SpecialChangePassword.php
M includes/specials/SpecialFileDuplicateSearch.php
M includes/specials/SpecialLinkSearch.php
M includes/specials/SpecialPrefixindex.php
M includes/specials/SpecialWhatlinkshere.php
6 files changed, 9 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/84/135184/1
diff --git a/includes/specials/SpecialAllpages.php
b/includes/specials/SpecialAllpages.php
index ad92298..0490d82 100644
--- a/includes/specials/SpecialAllpages.php
+++ b/includes/specials/SpecialAllpages.php
@@ -296,7 +296,7 @@
$bottomLinks = array();
# Do we put a previous link ?
- if ( isset( $prevTitle ) && $pt = $prevTitle->getText() ) {
+ if ( $prevTitle && $pt = $prevTitle->getText() ) {
$query = array( 'from' => $prevTitle->getText() );
if ( $namespace ) {
diff --git a/includes/specials/SpecialChangePassword.php
b/includes/specials/SpecialChangePassword.php
index f4ce882..dcd2443 100644
--- a/includes/specials/SpecialChangePassword.php
+++ b/includes/specials/SpecialChangePassword.php
@@ -83,7 +83,7 @@
$request = $this->getRequest();
$oldpassMsg = $this->mOldPassMsg;
- if ( !isset( $oldpassMsg ) ) {
+ if ( $oldpassMsg === null ) {
$oldpassMsg = $user->isLoggedIn() ? 'oldpassword' :
'resetpass-temp-password';
}
diff --git a/includes/specials/SpecialFileDuplicateSearch.php
b/includes/specials/SpecialFileDuplicateSearch.php
index 9cf5a73..b6c9d55 100644
--- a/includes/specials/SpecialFileDuplicateSearch.php
+++ b/includes/specials/SpecialFileDuplicateSearch.php
@@ -101,7 +101,7 @@
$this->setHeaders();
$this->outputHeader();
- $this->filename = isset( $par ) ? $par :
$this->getRequest()->getText( 'filename' );
+ $this->filename = $par !== null ? $par :
$this->getRequest()->getText( 'filename' );
$this->file = null;
$this->hash = '';
$title = Title::newFromText( $this->filename, NS_FILE );
diff --git a/includes/specials/SpecialLinkSearch.php
b/includes/specials/SpecialLinkSearch.php
index c44e8e1..b88e196 100644
--- a/includes/specials/SpecialLinkSearch.php
+++ b/includes/specials/SpecialLinkSearch.php
@@ -209,7 +209,7 @@
global $wgMiserMode;
$params = array();
$params['target'] = $this->mProt . $this->mQuery;
- if ( isset( $this->mNs ) && !$wgMiserMode ) {
+ if ( $this->mNs !== null && !$wgMiserMode ) {
$params['namespace'] = $this->mNs;
}
@@ -244,7 +244,7 @@
'options' => array( 'USE INDEX' => $clause )
);
- if ( isset( $this->mNs ) && !$wgMiserMode ) {
+ if ( $this->mNs !== null && !$wgMiserMode ) {
$retval['conds']['page_namespace'] = $this->mNs;
}
diff --git a/includes/specials/SpecialPrefixindex.php
b/includes/specials/SpecialPrefixindex.php
index b6b60d4..34e803d 100644
--- a/includes/specials/SpecialPrefixindex.php
+++ b/includes/specials/SpecialPrefixindex.php
@@ -76,7 +76,7 @@
);
$showme = '';
- if ( isset( $par ) ) {
+ if ( $par !== null ) {
$showme = $par;
} elseif ( $prefix != '' ) {
$showme = $prefix;
@@ -167,6 +167,7 @@
$fromList = $this->getNamespaceKeyAndText( $namespace, $from );
$prefixList = $this->getNamespaceKeyAndText( $namespace,
$prefix );
$namespaces = $wgContLang->getNamespaces();
+ $res = null;
if ( !$prefixList || !$fromList ) {
$out = $this->msg( 'allpagesbadtitle' )->parseAsBlock();
@@ -261,9 +262,7 @@
'</td>
<td id="mw-prefixindex-nav-form"
class="mw-prefixindex-nav">';
- if ( isset( $res ) && $res && ( $n == $this->maxPerPage
) &&
- ( $s = $res->fetchObject() )
- ) {
+ if ( $res && ( $n == $this->maxPerPage ) && ( $s =
$res->fetchObject() ) ) {
$query = array(
'from' => $s->page_title,
'prefix' => $prefix,
diff --git a/includes/specials/SpecialWhatlinkshere.php
b/includes/specials/SpecialWhatlinkshere.php
index 6488810..d980f79 100644
--- a/includes/specials/SpecialWhatlinkshere.php
+++ b/includes/specials/SpecialWhatlinkshere.php
@@ -64,7 +64,7 @@
$opts->validateIntBounds( 'limit', 0, 5000 );
// Give precedence to subpage syntax
- if ( isset( $par ) ) {
+ if ( $par !== null ) {
$opts->setValue( 'target', $par );
}
--
To view, visit https://gerrit.wikimedia.org/r/135184
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c382aeaa92372bc11220694c479006e3c658362
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: IAlex <coderev...@emsenhuber.ch>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
