| Index: trunk/phase3/maintenance/tests/SearchEngineTest.php |
| — | — | @@ -35,11 +35,11 @@ |
| 36 | 36 | |
| 37 | 37 | function removeSearchData() { |
| 38 | 38 | return; |
| 39 | | - while ( count( $this->pageList ) ) { |
| | 39 | + /*while ( count( $this->pageList ) ) { |
| 40 | 40 | list( $title, $id ) = array_pop( $this->pageList ); |
| 41 | 41 | $article = new Article( $title, $id ); |
| 42 | 42 | $article->doDeleteArticle( "Search Test" ); |
| 43 | | - } |
| | 43 | + }*/ |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | function fetchIds( $results ) { |
| Index: trunk/phase3/includes/db/DatabaseMssql.php |
| — | — | @@ -286,8 +286,9 @@ |
| 287 | 287 | $sql = $this->selectSQLText( $table, $vars, $conds, $fname, $options, $join_conds ); |
| 288 | 288 | if ( isset( $options['EXPLAIN'] ) ) { |
| 289 | 289 | sqlsrv_query( $this->mConn, "SET SHOWPLAN_ALL ON;" ); |
| 290 | | - return $this->query( $sql, $fname ); |
| | 290 | + $ret = $this->query( $sql, $fname ); |
| 291 | 291 | sqlsrv_query( $this->mConn, "SET SHOWPLAN_ALL OFF;" ); |
| | 292 | + return $ret; |
| 292 | 293 | } |
| 293 | 294 | return $this->query( $sql, $fname ); |
| 294 | 295 | } |
| Index: trunk/phase3/includes/filerepo/ForeignAPIFile.php |
| — | — | @@ -63,7 +63,7 @@ |
| 64 | 64 | $this->getName(), |
| 65 | 65 | isset( $params['width'] ) ? $params['width'] : -1, |
| 66 | 66 | isset( $params['height'] ) ? $params['height'] : -1 ); |
| 67 | | - return $this->handler->getTransform( $this, 'bogus', $thumbUrl, $params );; |
| | 67 | + return $this->handler->getTransform( $this, 'bogus', $thumbUrl, $params ); |
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | // Info we can get from API... |
| Index: trunk/phase3/includes/filerepo/ArchivedFile.php |
| — | — | @@ -140,7 +140,6 @@ |
| 141 | 141 | $this->deleted = $row->fa_deleted; |
| 142 | 142 | } else { |
| 143 | 143 | throw new MWException( 'This title does not correspond to an image page.' ); |
| 144 | | - return; |
| 145 | 144 | } |
| 146 | 145 | $this->dataLoaded = true; |
| 147 | 146 | $this->exists = true; |
| Index: trunk/phase3/includes/Hooks.php |
| — | — | @@ -46,12 +46,10 @@ |
| 47 | 47 | |
| 48 | 48 | if (!is_array($wgHooks)) { |
| 49 | 49 | throw new MWException("Global hooks array is not an array!\n"); |
| 50 | | - return false; |
| 51 | 50 | } |
| 52 | 51 | |
| 53 | 52 | if (!is_array($wgHooks[$event])) { |
| 54 | 53 | throw new MWException("Hooks array for event '$event' is not an array!\n"); |
| 55 | | - return false; |
| 56 | 54 | } |
| 57 | 55 | |
| 58 | 56 | foreach ($wgHooks[$event] as $index => $hook) { |
| Index: trunk/phase3/includes/media/PNGMetadataExtractor.php |
| — | — | @@ -45,23 +45,31 @@ |
| 46 | 46 | // Read chunks |
| 47 | 47 | while( !feof( $fh ) ) { |
| 48 | 48 | $buf = fread( $fh, 4 ); |
| 49 | | - if( !$buf ) { throw new Exception( __METHOD__ . ": Read error" ); return; } |
| | 49 | + if( !$buf ) { |
| | 50 | + throw new Exception( __METHOD__ . ": Read error" ); |
| | 51 | + } |
| 50 | 52 | $chunk_size = unpack( "N", $buf); |
| 51 | 53 | $chunk_size = $chunk_size[1]; |
| 52 | 54 | |
| 53 | 55 | $chunk_type = fread( $fh, 4 ); |
| 54 | | - if( !$chunk_type ) { throw new Exception( __METHOD__ . ": Read error" ); return; } |
| | 56 | + if( !$chunk_type ) { |
| | 57 | + throw new Exception( __METHOD__ . ": Read error" ); |
| | 58 | + } |
| 55 | 59 | |
| 56 | 60 | if ( $chunk_type == "acTL" ) { |
| 57 | 61 | $buf = fread( $fh, $chunk_size ); |
| 58 | | - if( !$buf ) { throw new Exception( __METHOD__ . ": Read error" ); return; } |
| | 62 | + if( !$buf ) { |
| | 63 | + throw new Exception( __METHOD__ . ": Read error" ); |
| | 64 | + } |
| 59 | 65 | |
| 60 | 66 | $actl = unpack( "Nframes/Nplays", $buf ); |
| 61 | 67 | $frameCount = $actl['frames']; |
| 62 | 68 | $loopCount = $actl['plays']; |
| 63 | 69 | } elseif ( $chunk_type == "fcTL" ) { |
| 64 | 70 | $buf = fread( $fh, $chunk_size ); |
| 65 | | - if( !$buf ) { throw new Exception( __METHOD__ . ": Read error" ); return; } |
| | 71 | + if( !$buf ) { |
| | 72 | + throw new Exception( __METHOD__ . ": Read error" ); |
| | 73 | + } |
| 66 | 74 | $buf = substr( $buf, 20 ); |
| 67 | 75 | |
| 68 | 76 | $fctldur = unpack( "ndelay_num/ndelay_den", $buf ); |
| Index: trunk/phase3/includes/MagicWord.php |
| — | — | @@ -648,7 +648,6 @@ |
| 649 | 649 | } |
| 650 | 650 | // This shouldn't happen either |
| 651 | 651 | throw new MWException( __METHOD__.': parameter not found' ); |
| 652 | | - return array( false, false ); |
| 653 | 652 | } |
| 654 | 653 | |
| 655 | 654 | /** |
| Index: trunk/phase3/includes/Namespace.php |
| — | — | @@ -117,7 +117,6 @@ |
| 118 | 118 | return isset( $nslist[$index] ); |
| 119 | 119 | } |
| 120 | 120 | |
| 121 | | - |
| 122 | 121 | /** |
| 123 | 122 | * Returns array of all defined namespaces with their canonical |
| 124 | 123 | * (English) names. |
| Index: trunk/phase3/includes/specials/SpecialResetpass.php |
| — | — | @@ -222,7 +222,6 @@ |
| 223 | 223 | } catch( PasswordError $e ) { |
| 224 | 224 | wfRunHooks( 'PrefsPasswordAudit', array( $user, $newpass, 'error' ) ); |
| 225 | 225 | throw new PasswordError( $e->getMessage() ); |
| 226 | | - return; |
| 227 | 226 | } |
| 228 | 227 | |
| 229 | 228 | $user->setCookies(); |