Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv8515/lib
Modified Files:
diff.php
Log Message:
Fix a formatting string. (Version was always reported as 'version 0'.)
Index: diff.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/diff.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** diff.php 2001/12/21 08:05:17 1.24
--- diff.php 2001/12/21 15:57:10 1.25
***************
*** 170,180 ****
$linked_version = QElement('a', array('href' => $url), $rev->getVersion());
$cols .= Element('td',
! sprintf(_("version %d"),$linked_version));
$cols .= QElement('td',
! sprintf(_("last modified on %s"),
! strftime($datetimeformat, $rev->get('mtime'))));
$cols .= QElement('td',
! sprintf(_("by %s"), $rev->get('author')));
} else {
$cols .= QElement('td', array('colspan' => '3'), _("None"));
--- 170,180 ----
$linked_version = QElement('a', array('href' => $url), $rev->getVersion());
$cols .= Element('td',
! __sprintf("version %s",$linked_version));
$cols .= QElement('td',
! __sprintf("last modified on %s",
! strftime($datetimeformat, $rev->get('mtime'))));
$cols .= QElement('td',
! __sprintf("by %s", $rev->get('author')));
} else {
$cols .= QElement('td', array('colspan' => '3'), _("None"));
***************
*** 252,256 ****
$new_link, $old_link, $page_link));
! $otherdiffs='';
$label = array('major' => _("Previous Major Revision"),
'minor' => _("Previous Revision"),
--- 252,256 ----
$new_link, $old_link, $page_link));
! $otherdiffs = array();
$label = array('major' => _("Previous Major Revision"),
'minor' => _("Previous Revision"),
***************
*** 260,270 ****
if ($version)
$args['version'] = $version;
! $otherdiffs .= ', ' . QElement('a', array('href' => WikiURL($pagename, $args),
! 'class' => 'wikiaction'),
! $label[$other]);
}
$html .= Element('p',
htmlspecialchars(_("Other diffs:"))
! . $otherdiffs . '.');
--- 260,270 ----
if ($version)
$args['version'] = $version;
! $otherdiffs[] = QElement('a', array('href' => WikiURL($pagename, $args),
! 'class' => 'wikiaction'),
! $label[$other]);
}
$html .= Element('p',
htmlspecialchars(_("Other diffs:"))
! . " " . join(", ", $otherdiffs) . '.');
|
