Merged pathinfo fix from stable

diff --git a/lib/weblib.php b/lib/weblib.php
index 813390735c85d9af0b3487b2d36de56b48593ccf..6e57b4ba8fabfa0b514cb8a6a668d08b4b34e75d 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -826,7 +826,7 @@ function get_slash_arguments($file='file.php') {
     $pathinfo = explode($file, $string);
 
     if (!empty($pathinfo[1])) {
-        return $pathinfo[1];
+        return addslashes($pathinfo[1]);
     } else {
         return false;
     }