diff options
| author | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-02-23 22:07:26 +0100 |
|---|---|---|
| committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-02-23 22:07:26 +0100 |
| commit | 8fcb305db0081dacd8e8ad0583da5ecc6c6837dc (patch) | |
| tree | 928fc44fde692835bca9dd304ebcb17cdd710ac8 /inc/html.php | |
| parent | 4d5954c8d1f8bcc5450f8cf70d8139cf5a1e697d (diff) | |
| parent | 5d873dd4ce31c79403a01ac0e40ff148be282592 (diff) | |
| download | rpg-8fcb305db0081dacd8e8ad0583da5ecc6c6837dc.tar.gz rpg-8fcb305db0081dacd8e8ad0583da5ecc6c6837dc.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into diff_navigation
Conflicts:
inc/html.php
Diffstat (limited to 'inc/html.php')
| -rw-r--r-- | inc/html.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/html.php b/inc/html.php index 2c7e8b1a6..72120438f 100644 --- a/inc/html.php +++ b/inc/html.php @@ -1233,7 +1233,7 @@ function html_diff($text = '', $intro = true, $type = null) { ptln('<p>'); // link to exactly this view FS#2835 - echo html_diff_navigationlink($type, 'difflink', $l_rev, $r_rev ? $r_rev : $INFO['lastmod']); + echo html_diff_navigationlink($type, 'difflink', $l_rev, $r_rev ? $r_rev : $INFO['currentrev']); ptln('</p>'); ptln('</div>'); // .diffoptions |