diff options
| author | Klap-in <klapinklapin@gmail.com> | 2013-07-21 23:10:32 +0200 |
|---|---|---|
| committer | Klap-in <klapinklapin@gmail.com> | 2013-07-21 23:10:32 +0200 |
| commit | b1ffadaa6963bbf83e61917c31e04c04c421ce9e (patch) | |
| tree | f9a1391d2ee6536473b1672e249c1b11a67a5b0e /inc/parser | |
| parent | fa3ed26bfbafa4d05ec77a799259d4a46baadd9a (diff) | |
| parent | fbd8067eeeb9f424981aad8b283e17f734c738c3 (diff) | |
| download | rpg-b1ffadaa6963bbf83e61917c31e04c04c421ce9e.tar.gz rpg-b1ffadaa6963bbf83e61917c31e04c04c421ce9e.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into fetchimagetokexternal
Diffstat (limited to 'inc/parser')
| -rw-r--r-- | inc/parser/handler.php | 2 | ||||
| -rw-r--r-- | inc/parser/metadata.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/inc/parser/handler.php b/inc/parser/handler.php index 55b715ad9..1cf32aaed 100644 --- a/inc/parser/handler.php +++ b/inc/parser/handler.php @@ -680,7 +680,7 @@ function Doku_Handler_Parse_Media($match) { } // Check whether this is a local or remote image - if ( preg_match('#^(https?|ftp)#i',$src) ) { + if ( media_isexternal($src) ) { $call = 'externalmedia'; } else { $call = 'internalmedia'; diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php index 8638ffa6a..e17b82f8b 100644 --- a/inc/parser/metadata.php +++ b/inc/parser/metadata.php @@ -432,7 +432,7 @@ class Doku_Renderer_metadata extends Doku_Renderer { global $ID; list($src,$hash) = explode('#',$src,2); - if(!preg_match('/^https?:\/\//i',$src)){ + if(!media_isexternal($src)){ resolve_mediaid(getNS($ID),$src, $exists); } if(preg_match('/.(jpe?g|gif|png)$/i',$src)){ |