From 81f950e84187f819f45b2e380ae91ca68b5ac1bf Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Thu, 4 Feb 2010 23:34:28 +0100
Subject: [PATCH] Revert "Remove old CVS-related code"

This reverts commit 36b4c8a71fd29949f80d7c1ff6c676d4eb5376ce.

We still are going to need the old parsing, because people are going to update
from release versions from CVS.
---
 framework/Core/lib/Horde/Config.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/framework/Core/lib/Horde/Config.php b/framework/Core/lib/Horde/Config.php
index 77365dfea..7071cfbc5 100644
--- a/framework/Core/lib/Horde/Config.php
+++ b/framework/Core/lib/Horde/Config.php
@@ -158,9 +158,14 @@ class Horde_Config
      */
     static public function getVersion($text)
     {
-        return preg_match('/\$Id:\s*[0-9a-f]+\s*\$/', $text, $match)
-            ? $match[0]
-            : false;
+        // @TODO: Old CVS tag
+        if (preg_match('/\$.*?conf\.xml,v .*? .*\$/', $text, $match) ||
+            // New Git tag
+            preg_match('/\$Id:\s*[0-9a-f]+\s*\$/', $text, $match)) {
+            return $match[0];
+        }
+
+        return false;
     }
 
     /**
-- 
2.11.0