diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2013-06-16 12:36:58 -0700 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2013-06-16 12:36:58 -0700 |
| commit | 06f8cfbed961eb9394fa29558dd29c79f87fc9ad (patch) | |
| tree | 20b02ae07d943248a0a01191409cd02120e5fcb3 /inc/parser | |
| parent | d6b7a2dd189b692f9a754f4f1a330abe6449669a (diff) | |
| parent | b9ee6a44e7499b5c2e9f117096cedc769ef2e25d (diff) | |
| download | rpg-06f8cfbed961eb9394fa29558dd29c79f87fc9ad.tar.gz rpg-06f8cfbed961eb9394fa29558dd29c79f87fc9ad.tar.bz2 | |
Merge pull request #225 from splitbrain/fetchftp
Add media_isexternal
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)){ |