| Index: trunk/extensions/ProfileMonitor/ProfileMonitor.class.php |
| — | — | @@ -17,8 +17,6 @@ |
| 18 | 18 | public function execute( $par ) { |
| 19 | 19 | global $wgOut, $wgRequest, $wgExtensionAssetsPath; |
| 20 | 20 | |
| 21 | | - |
| 22 | | - |
| 23 | 21 | $this->setHeaders(); |
| 24 | 22 | |
| 25 | 23 | $process = $wgRequest->getText( 'process' ); |
| Index: trunk/extensions/Cite/Cite_body.php |
| — | — | @@ -234,7 +234,7 @@ |
| 235 | 235 | return $this->error( 'cite_error_ref_too_many_keys' ); |
| 236 | 236 | } |
| 237 | 237 | |
| 238 | | - if ( $str === null and $key === null ) { |
| | 238 | + if ( $str === null && $key === null ) { |
| 239 | 239 | # Something like <ref />; this makes no sense. |
| 240 | 240 | $this->mRefCallStack[] = false; |
| 241 | 241 | return $this->error( 'cite_error_ref_no_key' ); |
| — | — | @@ -269,7 +269,7 @@ |
| 270 | 270 | return $this->error( 'cite_error_included_ref' ); |
| 271 | 271 | } |
| 272 | 272 | |
| 273 | | - if ( is_string( $key ) or is_string( $str ) ) { |
| | 273 | + if ( is_string( $key ) || is_string( $str ) ) { |
| 274 | 274 | # We don't care about the content: if the key exists, the ref |
| 275 | 275 | # is presumptively valid. Either it stores a new ref, or re- |
| 276 | 276 | # fers to an existing one. If it refers to a nonexistent ref, |
| — | — | @@ -527,7 +527,7 @@ |
| 528 | 528 | |
| 529 | 529 | $this->mParser = $parser; |
| 530 | 530 | |
| 531 | | - if ( isset( $argv['group'] ) and $wgAllowCiteGroups ) { |
| | 531 | + if ( isset( $argv['group'] ) && $wgAllowCiteGroups ) { |
| 532 | 532 | $group = $argv['group']; |
| 533 | 533 | unset ( $argv['group'] ); |
| 534 | 534 | } |
| — | — | @@ -595,7 +595,7 @@ |
| 596 | 596 | * @return string XHTML ready for output |
| 597 | 597 | */ |
| 598 | 598 | function referencesFormat( $group ) { |
| 599 | | - if ( ( count( $this->mRefs ) == 0 ) or ( empty( $this->mRefs[$group] ) ) ) { |
| | 599 | + if ( ( count( $this->mRefs ) == 0 ) || ( empty( $this->mRefs[$group] ) ) ) { |
| 600 | 600 | return ''; |
| 601 | 601 | } |
| 602 | 602 | |
| Index: trunk/extensions/Cite/SpecialCite_body.php |
| — | — | @@ -1,8 +1,6 @@ |
| 2 | 2 | <?php |
| 3 | 3 | if ( !defined( 'MEDIAWIKI' ) ) die(); |
| 4 | 4 | |
| 5 | | -global $wgContLang, $wgContLanguageCode, $wgCiteDefaultText; |
| 6 | | - |
| 7 | 5 | $dir = dirname( __FILE__ ) . DIRECTORY_SEPARATOR; |
| 8 | 6 | $code = $wgContLang->lc( $wgContLanguageCode ); |
| 9 | 7 | $file = file_exists( "${dir}cite_text-$code" ) ? "${dir}cite_text-$code" : "${dir}cite_text"; |