https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114146

Revision: 114146
Author:   reedy
Date:     2012-03-19 15:25:22 +0000 (Mon, 19 Mar 2012)
Log Message:
-----------
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

Modified Paths:
--------------
    trunk/phase3/maintenance/mwdocgen.php

Modified: trunk/phase3/maintenance/mwdocgen.php
===================================================================
--- trunk/phase3/maintenance/mwdocgen.php       2012-03-19 15:12:10 UTC (rev 
114145)
+++ trunk/phase3/maintenance/mwdocgen.php       2012-03-19 15:25:22 UTC (rev 
114146)
@@ -116,31 +116,7 @@
 
        $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 @@
                $file = readaline( "Enter file name $mwPath" );
        }
        $input = $mwPath . $file;
+       break;
 case 6:
        $input = $mwPath;
        $exclude_patterns = 'extensions';


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to