Package: horde3 Version: 3.0.4-4 Severity: normal Tags: patch Ola,
Here is the patch I promised that fixes the problem with viewing CVS and
subversion log comments in chora2.
----------8< Start here >8----------
diff -ur horde3-3.0.4/lib/Horde/VC/cvs.php horde3-3.0.4.new/lib/Horde/VC/cvs.php
--- horde3-3.0.4/lib/Horde/VC/cvs.php 2005-03-29 05:59:56.000000000 -0500
+++ horde3-3.0.4.new/lib/Horde/VC/cvs.php 2005-04-30 21:13:34.000000000
-0400
@@ -7,7 +7,7 @@
*
* Copyright 2000-2005 Anil Madhavapeddy, <[EMAIL PROTECTED]>
*
- * $Horde: framework/VC/VC/cvs.php,v 1.32.2.5 2005/02/02 18:46:04 chuck Exp $
+ * $Horde: framework/VC/VC/cvs.php,v 1.32.2.7 2005/05/01 01:13:34 chuck Exp $
*
* @author Anil Madhavapeddy <[EMAIL PROTECTED]>
* @package VC
@@ -593,7 +593,7 @@
* @var integer $cacheVersion
*/
$cacheVersion = 2;
- $cacheId = $filename . '_f' . (int)$quicklog . '_v' . $cacheVersion;
+ $cacheId = $rep->sourceroot() . '_n' . $filename . '_f' .
(int)$quicklog . '_v' . $cacheVersion;
if ($cache &&
$cache->exists($cacheId, time() - @filemtime($filename . ',v'))) {
@@ -789,7 +789,7 @@
} else {
$symrev[$regs[1]] = $regs[2];
if (empty($revsym[$regs[2]]))
$revsym[$regs[2]]=array();
- array_push($revsym[$regs[2]], $regs[1]);
+ $revsym[$regs[2]][] = $regs[1];
}
}
break;
@@ -804,7 +804,7 @@
$err = $log->processLog($accum);
// TODO: error checks - avsm
$this->logs[$log->queryRevision()] = &$log;
- array_push($this->revs, $log->queryRevision());
+ $this->revs[] = $log->queryRevision();
$accum = array();
}
break;
@@ -1000,7 +1000,7 @@
* @var integer $cacheVersion
*/
$cacheVersion = 1;
- $cacheId = $filename . '_f' . '_v' . $cacheVersion;
+ $cacheId = $rep->sourceroot() . '_n' . $filename . '_f_v' .
$cacheVersion;
if ($cache &&
$cache->exists($cacheId, time() - @filemtime($filename . ',v'))) {
diff -ur horde3-3.0.4/lib/Horde/VC/svn.php horde3-3.0.4.new/lib/Horde/VC/svn.php
--- horde3-3.0.4/lib/Horde/VC/svn.php 2005-03-29 05:59:56.000000000 -0500
+++ horde3-3.0.4.new/lib/Horde/VC/svn.php 2005-05-06 05:32:43.000000000
-0400
@@ -4,7 +4,7 @@
*
* Copyright 2000-2005 Anil Madhavapeddy, <[EMAIL PROTECTED]>
*
- * $Horde: framework/VC/VC/svn.php,v 1.28.4.4 2005/01/13 04:36:58 chuck Exp $
+ * $Horde: framework/VC/VC/svn.php,v 1.28.4.6 2005/05/06 09:32:43 jan Exp $
*
* @author Anil Madhavapeddy <[EMAIL PROTECTED]>
* @since Horde 3.0
@@ -476,7 +476,7 @@
* @var integer $cacheVersion
*/
$cacheVersion = 2;
- $cacheId = $filename . '_f' . (int)$quicklog . '_v' . $cacheVersion;
+ $cacheId = $rep->sourceroot() . '_n' . $filename . '_f' .
(int)$quicklog . '_v' . $cacheVersion;
if ($cache &&
// The file is cached for one hour no matter what, because
@@ -726,7 +726,7 @@
return false;
}
- if (preg_match('/^r([0-9]*) \| ([^ ]*) \| (.*) \(.*\) \| ([0-9]*)
lines?$/', $line, $matches)) {
+ if (preg_match('/^r([0-9]*) \| (.*?) \| (.*) \(.*\) \| ([0-9]*)
lines?$/', $line, $matches)) {
$this->rev = $matches[1];
$this->author = $matches[2];
$this->date = strtotime($matches[3]);
@@ -837,7 +837,7 @@
* @var integer $cacheVersion
*/
$cacheVersion = 1;
- $cacheId = $filename . '_f_v' . $cacheVersion;
+ $cacheId = $rep->sourceroot() . '_n' . $filename . '_f_v' .
$cacheVersion;
if ($cache &&
// The file is cached for one hour no matter what, because
----------8< End here >8----------
-- System Information:
Debian Release: 3.1
APT prefers testing
APT policy: (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.4.28-rc3-santiago-1
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ISO-8859-1)
Versions of packages horde3 depends on:
ii apache [httpd] 1.3.33-4 versatile, high-performance HTTP s
ii libapache-mod-php4 [phpapi-2 4:4.3.10-13 server-side, HTML-embedded scripti
ii php4 4:4.3.10-13 server-side, HTML-embedded scripti
ii php4-cgi [phpapi-20020918] 4:4.3.10-13 server-side, HTML-embedded scripti
ii php4-cli [phpapi-20020918] 4:4.3.10-13 command-line interpreter for the p
ii php4-domxml 4:4.3.10-13 XMLv2 module for php4
ii php4-pear 4:4.3.10-13 PEAR - PHP Extension and Applicati
ii php4-pear-log 1.6.0-1.1 Log module for PEAR
-- no debconf information
horde3-chora2.patch.gz
Description: Binary data
