aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/inc/parser/handler.php
diff options
context:
space:
mode:
authorDmitry Katsubo <dmitry.katsubo@gmail.com>2016-10-20 00:47:36 +0200
committerDmitry Katsubo <dmitry.katsubo@gmail.com>2016-10-22 00:38:32 +0200
commit6efc45a25e0ef5d61585c38faaeebb6cf265281f (patch)
tree6e6b62eb7f1f5c2ec788714e5792b16d36868786 /inc/parser/handler.php
parent1276211183789c12585224db2caabf24db561c68 (diff)
downloaddokuwiki-6efc45a25e0ef5d61585c38faaeebb6cf265281f.tar.gz
dokuwiki-6efc45a25e0ef5d61585c38faaeebb6cf265281f.zip
Implemented interwiki substitution for external images (issue #1614).
Diffstat (limited to 'inc/parser/handler.php')
-rw-r--r--inc/parser/handler.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index f477d36f8..a5e7f39cd 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -446,7 +446,7 @@ class Doku_Handler {
//decide which kind of link it is
- if ( preg_match('/^[a-zA-Z0-9\.]+>{1}.*$/u',$link[0]) ) {
+ if ( link_isinterwiki($link[0]) ) {
// Interwiki
$interwiki = explode('>',$link[0],2);
$this->_addCall(
@@ -693,8 +693,8 @@ function Doku_Handler_Parse_Media($match) {
$cache = 'cache';
}
- // Check whether this is a local or remote image
- if ( media_isexternal($src) ) {
+ // Check whether this is a local or remote image or interwiki
+ if (media_isexternal($src) || link_isinterwiki($src)){
$call = 'externalmedia';
} else {
$call = 'internalmedia';