From 315ddeaaa144208dbd7d06d7e1d1f48368df1b44 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Mon, 19 Mar 2012 15:25:22 +0000 Subject: [PATCH] Fix switch fall through Remove code for getting svn rev from SVN less than 1.4 - Ubuntu 8.04 LTS has 1.4.6 so should be pretty safe --- maintenance/mwdocgen.php | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/maintenance/mwdocgen.php b/maintenance/mwdocgen.php index a0c8587cd5..a353504cb6 100644 --- a/maintenance/mwdocgen.php +++ b/maintenance/mwdocgen.php @@ -116,31 +116,7 @@ function getSvnRevision( $dir ) { $content = file( $entries ); - // check if file is xml (subversion release <= 1.3) or not (subversion release = 1.4) - if ( preg_match( '/^<\?xml/', $content[0] ) ) { - // subversion is release <= 1.3 - if ( !function_exists( 'simplexml_load_file' ) ) { - // We could fall back to expat... YUCK - return false; - } - - $xml = simplexml_load_file( $entries ); - - if ( $xml ) { - foreach ( $xml->entry as $entry ) { - if ( $xml->entry[0]['name'] == '' ) { - // The directory entry should always have a revision marker. - if ( $entry['revision'] ) { - return intval( $entry['revision'] ); - } - } - } - } - return false; - } else { - // subversion is release 1.4 - return intval( $content[3] ); - } + return intval( $content[3] ); } /** @@ -273,6 +249,7 @@ case 5: $file = readaline( "Enter file name $mwPath" ); } $input = $mwPath . $file; + break; case 6: $input = $mwPath; $exclude_patterns = 'extensions'; -- 2.20.1