Show subversion too even if a "normal" version number is available

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 7d6d2f1..32cd5ae 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -254,6 +254,7 @@ The following extensions are migrated into MediaWiki 1.14:
 * (bug 16754) Making arbitrary rows of sortable tables sticky:
   |- class="unsortable"
 * (bug 16617) Add "talk" link to list of templates in edit mode
+* Show subversion too even if a "normal" version number is available
 
 === Bug fixes in 1.14 ===
 

diff --git a/includes/specials/SpecialVersion.php b/includes/specials/SpecialVersion.php
index bd7ccab..29f527f 100644 (file)
--- a/includes/specials/SpecialVersion.php
+++ b/includes/specials/SpecialVersion.php
@@ -157,15 +157,21 @@ class SpecialVersion extends SpecialPage {
                                usort( $wgExtensionCredits[$type], array( $this, 'compare' ) );
 
                                foreach ( $wgExtensionCredits[$type] as $extension ) {
+                                       $version = null;
+                                       $subVersion = '';
                                        if ( isset( $extension['version'] ) ) {
                                                $version = $extension['version'];
-                                       } elseif ( isset( $extension['svn-revision'] ) && 
+                                       }
+                                       if ( isset( $extension['svn-revision'] ) && 
                                                preg_match( '/\$(?:Rev|LastChangedRevision|Revision): *(\d+)/', 
-                                                       $extension['svn-revision'], $m ) ) 
-                                       {
-                                               $version = 'r' . $m[1];
-                                       } else {
-                                               $version = null;
+                                                       $extension['svn-revision'], $m ) ) {
+                                               $subVersion = 'r' . $m[1];
+                                       }
+
+                                       if( $version && $subVersion ) {
+                                               $version = $version . ' [' . $subVersion . ']';
+                                       } elseif ( !$version && $subVersion ) {
+                                               $version = $subVersion;
                                        }
 
                                        $out .= $this->formatCredits(