| Index: trunk/phase3/maintenance/tests/phpunit/includes/api/RandomImageGenerator.php |
| — | — | @@ -203,6 +203,7 @@ |
| 204 | 204 | $args[] = $filename; |
| 205 | 205 | |
| 206 | 206 | $command = wfEscapeShellArg( $wgImageMagickConvertCommand ) . " " . implode( " ", $args ); |
| | 207 | + $retval = null; |
| 207 | 208 | $output = wfShellExec( $command, $retval ); |
| 208 | 209 | return ( $retval === 0 ); |
| 209 | 210 | } |
| Index: trunk/phase3/includes/ImagePage.php |
| — | — | @@ -331,8 +331,6 @@ |
| 332 | 332 | $height_orig = $this->displayImg->getHeight( $page ); |
| 333 | 333 | $height = $height_orig; |
| 334 | 334 | |
| 335 | | - $showLink = false; |
| 336 | | - $linkAttribs = array( 'href' => $full_url ); |
| 337 | 335 | $longDesc = $this->displayImg->getLongDesc(); |
| 338 | 336 | |
| 339 | 337 | wfRunHooks( 'ImageOpenShowImageInlineBefore', array( &$this, &$wgOut ) ); |
| — | — | @@ -1011,6 +1009,7 @@ |
| 1012 | 1010 | } |
| 1013 | 1011 | $row .= '</td>'; |
| 1014 | 1012 | |
| | 1013 | + $rowClass = null; |
| 1015 | 1014 | wfRunHooks( 'ImagePageFileHistoryLine', array( $this, $file, &$row, &$rowClass ) ); |
| 1016 | 1015 | $classAttr = $rowClass ? " class='$rowClass'" : ""; |
| 1017 | 1016 | |
| Index: trunk/phase3/includes/db/DatabasePostgres.php |
| — | — | @@ -751,7 +751,6 @@ |
| 752 | 752 | return true; |
| 753 | 753 | } |
| 754 | 754 | return false; |
| 755 | | - |
| 756 | 755 | } |
| 757 | 756 | |
| 758 | 757 | /** |
| Index: trunk/phase3/includes/WatchlistEditor.php |
| — | — | @@ -347,7 +347,8 @@ |
| 348 | 348 | */ |
| 349 | 349 | private function showNormalForm( $output, $user ) { |
| 350 | 350 | global $wgUser; |
| 351 | | - if( ( $count = $this->showItemCount( $output, $user ) ) > 0 ) { |
| | 351 | + $count = $this->showItemCount( $output, $user ); |
| | 352 | + if( $count > 0 ) { |
| 352 | 353 | $self = SpecialPage::getTitleFor( 'Watchlist' ); |
| 353 | 354 | $form = Xml::openElement( 'form', array( 'method' => 'post', |
| 354 | 355 | 'action' => $self->getLocalUrl( array( 'action' => 'edit' ) ) ) ); |
| Index: trunk/phase3/includes/EditPage.php |
| — | — | @@ -2232,7 +2232,9 @@ |
| 2233 | 2233 | |
| 2234 | 2234 | $script = ''; |
| 2235 | 2235 | foreach ( $toolarray as $tool ) { |
| 2236 | | - if ( !$tool ) continue; |
| | 2236 | + if ( !$tool ) { |
| | 2237 | + continue; |
| | 2238 | + } |
| 2237 | 2239 | |
| 2238 | 2240 | $params = array( |
| 2239 | 2241 | $image = $wgStylePath . '/common/images/' . $tool['image'], |
| Index: trunk/phase3/includes/HistoryPage.php |
| — | — | @@ -538,7 +538,9 @@ |
| 539 | 539 | $rev->isDeleted( Revision::DELETED_RESTRICTED ), false ); |
| 540 | 540 | } |
| 541 | 541 | } |
| 542 | | - if( $del ) $s .= " $del "; |
| | 542 | + if ( $del ) { |
| | 543 | + $s .= " $del "; |
| | 544 | + } |
| 543 | 545 | |
| 544 | 546 | $s .= " $link"; |
| 545 | 547 | $s .= " <span class='history-user'>" . |