"MDL-16650, return raw URLs directly"

diff --git a/repository/ws.php b/repository/ws.php
index dbcbe98a552ab381e43446841b935fa756d1f4d1..cc5924b366c12aa675e2964ffd09ffcbe96316a1 100644 (file)
--- 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;