diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2025-03-15 13:05:47 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2025-03-15 14:22:26 +0100 |
| commit | 3ef8921ca346ef2633838233cfb869fee9c2804d (patch) | |
| tree | a75541d8ef9b4bc29a1f75f8d28a236cbfd22682 | |
| parent | 22da4ff5ae89e0d0171dcf1985488390fe678ef3 (diff) | |
| download | dokuwiki-mediaFNrev.tar.gz dokuwiki-mediaFNrev.zip | |
attempt to fix test on githubmediaFNrev
filemtimes are super weird on github
| -rw-r--r-- | _test/tests/inc/pageutils_mediaFN.test.php | 11 | ||||
| -rw-r--r-- | inc/pageutils.php | 3 |
2 files changed, 8 insertions, 6 deletions
diff --git a/_test/tests/inc/pageutils_mediaFN.test.php b/_test/tests/inc/pageutils_mediaFN.test.php index 9b08d9b67..0a554ebca 100644 --- a/_test/tests/inc/pageutils_mediaFN.test.php +++ b/_test/tests/inc/pageutils_mediaFN.test.php @@ -9,15 +9,11 @@ class mediafn_test extends DokuWikiTest */ public function mediaFNProvider() { - - $currentRev = filemtime(DOKU_TMP_DATA . 'media/wiki/dokuwiki-128.png'); - return [ // current ['wiki:dokuwiki-128.png', '', true, DOKU_TMP_DATA . 'media/wiki/dokuwiki-128.png'], ['wiki:dokuwiki-128.png', false, true, DOKU_TMP_DATA . 'media/wiki/dokuwiki-128.png'], ['wiki:dokuwiki-128.png', null, true, DOKU_TMP_DATA . 'media/wiki/dokuwiki-128.png'], - ['wiki:dokuwiki-128.png', $currentRev, true, DOKU_TMP_DATA . 'media/wiki/dokuwiki-128.png'], // old ['wiki:dokuwiki-128.png', 1234567890, true, DOKU_TMP_DATA . 'media_attic/wiki/dokuwiki-128.1234567890.png'], @@ -37,5 +33,12 @@ class mediafn_test extends DokuWikiTest $this->assertEquals($expected, $result); } + public function testMediaFNCurrentRev() + { + $currentRev = filemtime(DOKU_TMP_DATA . 'media/wiki/dokuwiki-128.png'); + $result = mediaFN('wiki:dokuwiki-128.png', $currentRev); + $this->assertEquals(DOKU_TMP_DATA . 'media/wiki/dokuwiki-128.png', $result); + } + } diff --git a/inc/pageutils.php b/inc/pageutils.php index 148d24860..0b913c109 100644 --- a/inc/pageutils.php +++ b/inc/pageutils.php @@ -458,8 +458,7 @@ function mediaFN($id, $rev = '', $clean = true) global $conf; if ($clean) $id = cleanID($id); $id = str_replace(':', '/', $id); - $rev = (int) $rev;; - + $rev = (int) $rev; // current file $simple = $conf['mediadir'] . '/' . utf8_encodeFN($id); |