summaryrefslogtreecommitdiff
path: root/inc/media.php
diff options
context:
space:
mode:
authorlisps <stummp@loewen.de>2013-11-22 09:13:53 +0100
committerlisps <stummp@loewen.de>2013-11-22 09:13:53 +0100
commitac6dc646a5823005fd7f9747f2c333bd6379baee (patch)
tree9750dc37067ea677d6b2b5555eb1c56c707383ea /inc/media.php
parent4bde2196a1e3572cead3f4d4e4b6a5a752bd62b3 (diff)
parent332817fccb0577125da59b71f437e72ae823a7c8 (diff)
downloadrpg-ac6dc646a5823005fd7f9747f2c333bd6379baee.tar.gz
rpg-ac6dc646a5823005fd7f9747f2c333bd6379baee.tar.bz2
Merge remote-tracking branch 'remotes/splitbrain/diff_navigation' into revisions
Diffstat (limited to 'inc/media.php')
-rw-r--r--inc/media.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/inc/media.php b/inc/media.php
index 9f0c2cb8c..3bdaa8ef7 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -492,8 +492,8 @@ function media_saveOldRevision($id){
$date = filemtime($oldf);
if (!$conf['mediarevisions']) return $date;
- $pagelog = new PageRevisionLog($id);
- if (!$pagelog->getRevisionInfo($date, 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'))) {
@@ -1072,8 +1072,8 @@ function media_diff($image, $ns, $auth, $fromajax = false) {
$l_rev = $rev1;
}else{ // no revision was given, compare previous to current
$r_rev = '';
- $pagelog = new PageRevisionLog($image);
- $revs = $pagelog->getRevisions(0, 1, true);
+ $medialog = new MediaChangeLog($image);
+ $revs = $medialog->getRevisions(0, 1);
if (file_exists(mediaFN($image, $revs[0]))) {
$l_rev = $revs[0];
} else {