* (bug 20730) Fix to Special:Version ViewVC link for branch checkouts

Reverts r49997; link is now using the checkout revision which makes pathrev work properly again for branches, so we don't need to use the (apparently non-functional) revision parameter instead.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b3ba594..0395464 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -521,6 +521,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 20726) Title::getLatestRevID's documentation now says that the function
   returns false if the page doesn't exist
 * (bug 20751) ForeignApiRepo now urldecodes filenames when saving to local cache
+* (bug 20730) Fix to Special:Version ViewVC link for branch checkouts
 
 == API changes in 1.16 ==
 

diff --git a/includes/specials/SpecialVersion.php b/includes/specials/SpecialVersion.php
index 94aff45..c9fd892 100644 (file)
--- a/includes/specials/SpecialVersion.php
+++ b/includes/specials/SpecialVersion.php
@@ -477,12 +477,7 @@ class SpecialVersion extends SpecialPage {
                                $info['url']
                        );
                        $pathRelativeToRepo = substr( $info['url'], strlen( $info['repo-url'] ) );
-                       if ( substr( $pathRelativeToRepo, 0, 6 ) == '/trunk' ) {
-                               $viewvc .= '/?pathrev=';
-                       } else {
-                               // Avoids 404 error using pathrev when it does not found
-                               $viewvc .= '/?revision=';
-                       }
+                       $viewvc .= '/?pathrev=';
                        $viewvc .= urlencode( $info['checkout-rev'] );
                        $info['viewvc-url'] = $viewvc;
                }