From: Joel U. <uck...@us...> - 2001-06-26 18:03:44
|
Update of /cvsroot/phpwiki/phpwiki/lib In directory usw-pr-cvs1:/tmp/cvs-serv7389 Modified Files: diff.php Log Message: Added $version to RetrievePage calls. Changed to recognize $ver1 and $ver2 in URLs to allow diffs of aribtrary page versions. Index: diff.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/diff.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** diff.php 2001/04/07 00:34:30 1.11 --- diff.php 2001/06/26 18:03:41 1.12 *************** *** 1050,1065 **** if (isset($pagename)) { ! $wiki = RetrievePage($dbi, $pagename, $WikiPageStore); ! $archive= RetrievePage($dbi, $pagename, $ArchivePageStore); $html = Element('table', ! PageInfoRow(gettext ("Current page:"), $wiki) ! . PageInfoRow(gettext ("Archived page:"), $archive)); $html .= "<p>\n"; ! if (is_array($wiki) && is_array($archive)) { ! $diff = new WikiDiff($archive['content'], $wiki['content']); if ($diff->isEmpty()) { $html .= '<hr>[' . gettext ("Versions are identical") . ']'; --- 1050,1074 ---- if (isset($pagename)) { ! if (!isset($ver1)) { ! if (isset($ver2)) $ver1 = $ver2 - 1; ! else { ! $ver1 = GetMaxVersionNumber($dbi, $pagename, $ArchivePageStore); ! $ver2 = 0; ! } ! } ! elseif (!isset($ver2)) $ver2 = 0; + $older = RetrievePage($dbi, $pagename, SelectStore($dbi, $pagename, $ver1, $WikiPageStore, $ArchivePageStore), $ver1); + $newer = RetrievePage($dbi, $pagename, SelectStore($dbi, $pagename, $ver2, $WikiPageStore, $ArchivePageStore), $ver2); + $html = Element('table', ! PageInfoRow(gettext ("Newer page:"), $newer) ! . PageInfoRow(gettext ("Older page:"), $older)); $html .= "<p>\n"; ! if (is_array($newer) && is_array($older)) { ! $diff = new WikiDiff($older['content'], $newer['content']); if ($diff->isEmpty()) { $html .= '<hr>[' . gettext ("Versions are identical") . ']'; *************** *** 1067,1071 **** //$fmt = new WikiDiffFormatter; $fmt = new WikiUnifiedDiffFormatter; ! $html .= $fmt->format($diff, $archive['content']); } } --- 1076,1080 ---- //$fmt = new WikiDiffFormatter; $fmt = new WikiUnifiedDiffFormatter; ! $html .= $fmt->format($diff, $older['content']); } } |