From 122d195baca0e1f834082ca160572659c8cf3bd9 Mon Sep 17 00:00:00 2001 From: dongsheng Date: Mon, 20 Oct 2008 01:40:19 +0000 Subject: [PATCH] "MDL-16650, return raw URLs directly" --- repository/ws.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/repository/ws.php b/repository/ws.php index dbcbe98a55..cc5924b366 100644 --- a/repository/ws.php +++ b/repository/ws.php @@ -155,12 +155,15 @@ EOD; $path = $repo->get_file($file, $title); $itemid = (int)substr(hexdec(uniqid()), 0, 9)+rand(1,100); try { - $info = repository_move_to_filepool($path, $title, $itemid); - if ($env == 'form'){ - echo json_encode($info); - } else if ($env == 'editor') { - echo json_encode($info); + if (preg_match('#(https?://([-\w\.]+)+(:\d+)?(/([\w/_\.]*(\?\S+)?)?)?)#', $path)) { + return array('url'=>$path); } else { + $info = repository_move_to_filepool($path, $title, $itemid); + if ($env == 'form'){ + echo json_encode($info); + } else if ($env == 'editor') { + echo json_encode($info); + } } } catch (repository_exception $e){ $err = new stdclass; -- 2.39.5