diff options
| author | Christopher Smith <chris@jalakai.co.uk> | 2014-03-16 19:17:36 +0000 |
|---|---|---|
| committer | Christopher Smith <chris@jalakai.co.uk> | 2014-03-16 19:17:36 +0000 |
| commit | f10dcc4dcaefb086f27df5535c619073e0665b2e (patch) | |
| tree | 5eeb0ba4c52090d77e46e897f5f40fd2b02bd224 /inc/media.php | |
| parent | b81c3dc020112e09a2a1342b95aa55e47e9a6c90 (diff) | |
| parent | 01486f869816b6358d14a710f3d89b190e9391b4 (diff) | |
| download | rpg-f10dcc4dcaefb086f27df5535c619073e0665b2e.tar.gz rpg-f10dcc4dcaefb086f27df5535c619073e0665b2e.tar.bz2 | |
Merge pull request #169 from splitbrain/diff_navigation
Added diff navigation
Diffstat (limited to 'inc/media.php')
| -rw-r--r-- | inc/media.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/inc/media.php b/inc/media.php index 894333b11..2c1a3e8eb 100644 --- a/inc/media.php +++ b/inc/media.php @@ -501,7 +501,8 @@ function media_saveOldRevision($id){ $date = filemtime($oldf); if (!$conf['mediarevisions']) return $date; - if (!getRevisionInfo($id, $date, 8192, true)) { + $medialog = new MediaChangeLog($id); + if (!$medialog->getRevisionInfo($date)) { // there was an external edit, // there is no log entry for current version of file if (!@file_exists(mediaMetaFN($id,'.changes'))) { @@ -1093,7 +1094,8 @@ function media_diff($image, $ns, $auth, $fromajax = false) { $l_rev = $rev1; }else{ // no revision was given, compare previous to current $r_rev = ''; - $revs = getRevisions($image, 0, 1, 8192, true); + $medialog = new MediaChangeLog($image); + $revs = $medialog->getRevisions(0, 1); if (file_exists(mediaFN($image, $revs[0]))) { $l_rev = $revs[0]; } else { |