summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Hamann <michael@content-space.de>2013-10-29 20:52:27 +0100
committerMichael Hamann <michael@content-space.de>2013-10-29 20:54:16 +0100
commit9269d0b1fb78c217069efd497734c183df9937be (patch)
treefe4727d185177c08a891a09be75d985af7c8eab6
parent93d16b87e9f2ab15088bd0d7adfbfce17336c28c (diff)
downloadrpg-9269d0b1fb78c217069efd497734c183df9937be.tar.gz
rpg-9269d0b1fb78c217069efd497734c183df9937be.tar.bz2
Fix the media usage index to include local links
-rw-r--r--_test/tests/inc/fulltext_mediause.test.php7
-rw-r--r--inc/parser/metadata.php7
2 files changed, 13 insertions, 1 deletions
diff --git a/_test/tests/inc/fulltext_mediause.test.php b/_test/tests/inc/fulltext_mediause.test.php
index 9d5b2dc84..503b8bc84 100644
--- a/_test/tests/inc/fulltext_mediause.test.php
+++ b/_test/tests/inc/fulltext_mediause.test.php
@@ -26,6 +26,13 @@ class fultext_mediause_test extends DokuWikiTest {
$this->assertEquals(array('test:medialinks'), ft_mediause('test:example.png'));
}
+ public function test_media_in_local_links() {
+ saveWikiText('test:locallinks', '[[#test|{{wiki:logolocal.png}}]]', 'Test init');
+ idx_addPage('test:locallinks');
+
+ $this->assertEquals(array('test:locallinks'), ft_mediause('wiki:logolocal.png'));
+ }
+
public function test_media_in_footnotes() {
saveWikiText('test:media_footnotes', '(({{footnote.png?20x50}} [[foonote|{{:footlink.png}}]]))', 'Test initialization');
idx_addPage('test:media_footnotes');
diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php
index 437559370..8ba159d62 100644
--- a/inc/parser/metadata.php
+++ b/inc/parser/metadata.php
@@ -274,7 +274,12 @@ class Doku_Renderer_metadata extends Doku_Renderer {
$this->internallink($link, $link);
}
- function locallink($hash, $name = null){}
+ function locallink($hash, $name = null){
+ if(is_array($name)) {
+ $this->_firstimage($name['src']);
+ if ($name['type'] == 'internalmedia') $this->_recordMediaUsage($name['src']);
+ }
+ }
/**
* keep track of internal links in $this->meta['relation']['references']