Fix a bunch of '? true : false' instances

diff --git a/includes/Autopromote.php b/includes/Autopromote.php
index 560ba7a..e8ef7fc 100644 (file)
--- a/includes/Autopromote.php
+++ b/includes/Autopromote.php
@@ -143,7 +143,7 @@ class Autopromote {
                                        throw new MWException( "Unrecognized condition {$cond[0]} for autopromotion!" );
                                }
 
-                               return $result ? true : false;
+                               return (bool)$result;
                }
        }
 }

diff --git a/includes/Skin.php b/includes/Skin.php
index 51ea098..f7520fe 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -2046,7 +2046,7 @@ class Skin extends Linker {
 
                return array(
                        'href' => $title->getLocalURL( $urlaction ),
-                       'exists' => $title->getArticleID() != 0 ? true : false
+                       'exists' => $title->getArticleID() != 0;
                );
        }
 

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 79c8728..8425333 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -659,7 +659,7 @@ class SkinTemplate extends Skin {
                self::checkTitle( $title, $name );
                return array(
                        'href' => $title->getLocalURL( $urlaction ),
-                       'exists' => $title->getArticleID() != 0 ? true : false
+                       'exists' => $title->getArticleID() != 0,
                );
        }
 
@@ -669,7 +669,7 @@ class SkinTemplate extends Skin {
                self::checkTitle( $title, $name );
                return array(
                        'href' => $title->getLocalURL( $urlaction ),
-                       'exists' => $title->getArticleID() != 0 ? true : false
+                       'exists' => $title->getArticleID() != 0,
                );
        }
 

diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index 3dede3c..09eded6 100644 (file)
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -345,7 +345,7 @@ class WebRequest {
         * @return Boolean
         */
        public function getBool( $name, $default = false ) {
-               return $this->getVal( $name, $default ) ? true : false;
+               return (bool)$this->getVal( $name, $default );
        }
        
        /**

diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php
index 53f4173..672e022 100644 (file)
--- a/includes/db/DatabasePostgres.php
+++ b/includes/db/DatabasePostgres.php
@@ -1179,7 +1179,7 @@ class DatabasePostgres extends DatabaseBase {
                        . "AND c.relkind IN ('" . implode( "','", $types ) . "')";
                $res = $this->query( $SQL );
                $count = $res ? $res->numRows() : 0;
-               return $count ? true : false;
+               return (bool)$count;
        }
 
        /**

diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index 97fa8df..ccf10de 100644 (file)
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -487,7 +487,7 @@ class WebInstaller_Name extends WebInstallerPage {
                        // Title-style validation
                        $title = Title::newFromText( $name );
                        if ( !$title ) {
-                               $good = $nsType == 'site-name' ? true : false;
+                               $good = $nsType == 'site-name';
                        } else {
                                $name = $title->getDBkey();
                                $good = true;

diff --git a/includes/specials/SpecialAllmessages.php b/includes/specials/SpecialAllmessages.php
index a3ebaf9..f76b215 100644 (file)
--- a/includes/specials/SpecialAllmessages.php
+++ b/includes/specials/SpecialAllmessages.php
@@ -100,19 +100,19 @@ class SpecialAllmessages extends SpecialPage {
                                                'filter',
                                                'unmodified',
                                                'mw-allmessages-form-filter-unmodified',
-                                               ( $this->filter == 'unmodified' ? true : false )
+                                               ( $this->filter == 'unmodified' )
                                        ) .
                                        Xml::radioLabel( wfMsg( 'allmessages-filter-all' ),
                                                'filter',
                                                'all',
                                                'mw-allmessages-form-filter-all',
-                                               ( $this->filter == 'all' ? true : false )
+                                               ( $this->filter == 'all' )
                                        ) .
                                        Xml::radioLabel( wfMsg( 'allmessages-filter-modified' ),
                                                'filter',
                                                'modified',
                                                'mw-allmessages-form-filter-modified',
-                                       ( $this->filter == 'modified' ? true : false )
+                                       ( $this->filter == 'modified' )
                                ) .
                                "</td>\n
                        </tr>
@@ -124,7 +124,7 @@ class SpecialAllmessages extends SpecialPage {
                                        Xml::openElement( 'select', array( 'id' => 'mw-allmessages-form-lang', 'name' => 'lang' ) );
 
                foreach( $languages as $lang => $name ) {
-                       $selected = $lang == $this->langCode ? true : false;
+                       $selected = $lang == $this->langCode;
                        $out .= Xml::option( $lang . ' - ' . $name, $lang, $selected ) . "\n";
                }
                $out .= Xml::closeElement( 'select' ) .

diff --git a/includes/specials/SpecialBlockip.php b/includes/specials/SpecialBlockip.php
index f3c9044..2d2d034 100644 (file)
--- a/includes/specials/SpecialBlockip.php
+++ b/includes/specials/SpecialBlockip.php
@@ -188,7 +188,7 @@ class IPBlockForm extends SpecialPage {
                        list( $show, $value ) = explode( ':', $option );
                        $show = htmlspecialchars( $show );
                        $value = htmlspecialchars( $value );
-                       $blockExpiryFormOptions .= Xml::option( $show, $value, $this->BlockExpiry === $value ? true : false ) . "\n";
+                       $blockExpiryFormOptions .= Xml::option( $show, $value, $this->BlockExpiry === $value ) . "\n";
                }
 
                $reasonDropDown = Xml::listDropDown( 'wpBlockReasonList',

diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index c6cb973..8487694 100644 (file)
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -346,9 +346,9 @@ class SpecialContributions extends SpecialPage {
 
                $f .=   Xml::fieldset( wfMsg( 'sp-contributions-search' ) ) .
                        Xml::radioLabel( wfMsgExt( 'sp-contributions-newbies', array( 'parsemag' ) ),
-                               'contribs', 'newbie' , 'newbie', $this->opts['contribs'] == 'newbie' ? true : false ) . '<br />' .
+                               'contribs', 'newbie' , 'newbie', $this->opts['contribs'] == 'newbie' ) . '<br />' .
                        Xml::radioLabel( wfMsgExt( 'sp-contributions-username', array( 'parsemag' ) ),
-                               'contribs' , 'user', 'user', $this->opts['contribs'] == 'user' ? true : false ) . ' ' .
+                               'contribs' , 'user', 'user', $this->opts['contribs'] == 'user' ) . ' ' .
                        Html::input( 'target', $this->opts['target'], 'text', array(
                                'size' => '20',
                                'required' => ''

diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index a04ca91..86feace 100644 (file)
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -67,7 +67,7 @@ class SpecialSearch {
                if( empty( $this->namespaces ) ) {
                        $this->namespaces = SearchEngine::userNamespaces( $user );
                }
-               $this->searchRedirects = $request->getcheck( 'redirs' ) ? true : false;
+               $this->searchRedirects = $request->getCheck( 'redirs' );
                $this->searchAdvanced = $request->getVal( 'advanced' );
                $this->active = 'advanced';
                $this->sk = $user->getSkin();