| Index: trunk/phase3/includes/SpecialPreferences.php |
| — | — | @@ -656,7 +656,7 @@ |
| 657 | 657 | |
| 658 | 658 | # <FIXME> |
| 659 | 659 | # Enotif |
| 660 | | - if ($wgEnableEmail) { |
| | 660 | + if ($wgEnableEmail) { |
| 661 | 661 | $wgOut->addHTML( '<fieldset><legend>' . wfMsg( 'email' ) . '</legend>' ); |
| 662 | 662 | $wgOut->addHTML( |
| 663 | 663 | $emailauthenticated. |
| Index: trunk/phase3/includes/DatabasePostgreSQL.php |
| — | — | @@ -120,7 +120,7 @@ |
| 121 | 121 | |
| 122 | 122 | function fetchRow( $res ) { |
| 123 | 123 | @$row = pg_fetch_array( $res ); |
| 124 | | - if( pg_last_error($this->mConn) ) { |
| | 124 | + if( pg_last_error($this->mConn) ) { |
| 125 | 125 | wfDebugDieBacktrace( 'SQL error: ' . htmlspecialchars( pg_last_error($this->mConn) ) ); |
| 126 | 126 | } |
| 127 | 127 | return $row; |
| Index: trunk/phase3/includes/ZhClient.php |
| — | — | @@ -119,7 +119,7 @@ |
| 120 | 120 | $i+=$len; |
| 121 | 121 | } |
| 122 | 122 | return $ret; |
| 123 | | - } |
| | 123 | + } |
| 124 | 124 | /** |
| 125 | 125 | * Perform word segmentation |
| 126 | 126 | * |
| Index: trunk/phase3/includes/SpecialUpload.php |
| — | — | @@ -620,9 +620,9 @@ |
| 621 | 621 | </tr> |
| 622 | 622 | <tr>" ); |
| 623 | 623 | |
| 624 | | - if ( $licenseshtml != '' ) { |
| 625 | | - global $wgStylePath; |
| 626 | | - $wgOut->addHTML( " |
| | 624 | + if ( $licenseshtml != '' ) { |
| | 625 | + global $wgStylePath; |
| | 626 | + $wgOut->addHTML( " |
| 627 | 627 | <td align='right'><label for='wpLicense'>$license:</label></td> |
| 628 | 628 | <td align='left'> |
| 629 | 629 | <script type='text/javascript' src=\"$wgStylePath/common/upload.js\"></script> |
| — | — | @@ -635,15 +635,15 @@ |
| 636 | 636 | </tr> |
| 637 | 637 | <tr> |
| 638 | 638 | "); |
| 639 | | - } |
| | 639 | + } |
| 640 | 640 | |
| 641 | | - if ( $wgUseCopyrightUpload ) { |
| 642 | | - $filestatus = wfMsgHtml ( 'filestatus' ); |
| 643 | | - $copystatus = htmlspecialchars( $this->mUploadCopyStatus ); |
| 644 | | - $filesource = wfMsgHtml ( 'filesource' ); |
| 645 | | - $uploadsource = htmlspecialchars( $this->mUploadSource ); |
| 646 | | - |
| 647 | | - $wgOut->addHTML( " |
| | 641 | + if ( $wgUseCopyrightUpload ) { |
| | 642 | + $filestatus = wfMsgHtml ( 'filestatus' ); |
| | 643 | + $copystatus = htmlspecialchars( $this->mUploadCopyStatus ); |
| | 644 | + $filesource = wfMsgHtml ( 'filesource' ); |
| | 645 | + $uploadsource = htmlspecialchars( $this->mUploadSource ); |
| | 646 | + |
| | 647 | + $wgOut->addHTML( " |
| 648 | 648 | <td align='right' nowrap='nowrap'><label for='wpUploadCopyStatus'>$filestatus:</label></td> |
| 649 | 649 | <td><input tabindex='5' type='text' name='wpUploadCopyStatus' id='wpUploadCopyStatus' value=\"$copystatus\" size='40' /></td> |
| 650 | 650 | </tr> |
| — | — | @@ -653,10 +653,10 @@ |
| 654 | 654 | </tr> |
| 655 | 655 | <tr> |
| 656 | 656 | "); |
| 657 | | - } |
| | 657 | + } |
| 658 | 658 | |
| 659 | 659 | |
| 660 | | - $wgOut->addHtml( " |
| | 660 | + $wgOut->addHtml( " |
| 661 | 661 | <td></td> |
| 662 | 662 | <td> |
| 663 | 663 | <input tabindex='7' type='checkbox' name='wpWatchthis' id='wpWatchthis' $watchChecked value='true' /> |
| — | — | @@ -677,8 +677,8 @@ |
| 678 | 678 | <td></td> |
| 679 | 679 | <td align='left'> |
| 680 | 680 | " ); |
| 681 | | - $wgOut->addWikiText( wfMsgForContent( 'edittools' ) ); |
| 682 | | - $wgOut->addHTML( " |
| | 681 | + $wgOut->addWikiText( wfMsgForContent( 'edittools' ) ); |
| | 682 | + $wgOut->addHTML( " |
| 683 | 683 | </td> |
| 684 | 684 | </tr> |
| 685 | 685 | |