fixed fileurl and logurl in list-view for later deleted items (#304)

websvnphp · Dec 8, 2010 · d39aec9 · d39aec9
1 parent 5290327
commit d39aec9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/include/utils.php b/include/utils.php
@@ -73,6 +73,13 @@ function createRevAndPegString($rev, $peg) {
 	return implode('&amp;', $params);
 }
 
+function createDifferentRevAndPegString($rev, $peg) {
+	$params = array();
+	if ($rev && (!$peg || $rev != $peg)) $params[] = 'rev='.$rev;
+	if ($peg) $params[] = 'peg='.$peg;
+	return implode('&amp;', $params);
+}
+
 function anchorForPath($path) {
 	global $config;
 

diff --git a/listing.php b/listing.php
@@ -124,9 +124,17 @@ function showDirFiles($svnrep, $subs, $level, $limit, $rev, $peg, $listing, $ind
 				$listing[$index]['node'] = 0; // t-node
 				$listing[$index]['path'] = $path.$file;
 				$listing[$index]['filename'] = $file;
-				$listing[$index]['fileurl'] = urlForPath($path.$file, $passRevString);
+				if ($isDir) {
+					$listing[$index]['fileurl'] = urlForPath($path.$file, $passRevString);
+				} else {
+					$listing[$index]['fileurl'] = urlForPath($path.$file, createDifferentRevAndPegString($passrev, $peg));
+				}
 				$listing[$index]['filelink'] = '<a href="'.$listing[$index]['fileurl'].'">'.$listing[$index]['filename'].'</a>';
-				$listing[$index]['logurl'] = $config->getURL($rep, $path.$file, 'log').$isDirString.$passRevString;
+				if ($isDir) {
+					$listing[$index]['logurl'] = $config->getURL($rep, $path.$file, 'log').$isDirString.$passRevString;
+				} else {
+					$listing[$index]['logurl'] = $config->getURL($rep, $path.$file, 'log').$isDirString.createDifferentRevAndPegString($passrev, $peg);
+				}
 
 				if ($treeview) {
 					$listing[$index]['compare_box'] = '<input type="checkbox" name="compare[]" value="'.$path.$file.'@'.$passrev.'" onclick="checkCB(this)" />';