Merge branch 'sgmurphy-clone/0.7.x' into 0.7.x

diff --git a/lib/util.php b/lib/util.php
index cbff35a9d68ec9ae78020494e0e78a3ce40baa1c..5275ad6b6e49b813f93656f5b6f0d4e75e554521 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -447,7 +447,7 @@ function common_replace_urls_callback($text, $callback) {
         
         // Replace it!
         $start = mb_strpos($text, $url, $offset);
-        $text = substr_replace($text, $modified_url, $start, mb_strlen($url));
+        $text = mb_substr($text, 0, $start).$modified_url.mb_substr($text, $start + mb_strlen($url), mb_strlen($text));
         $offset = $start + mb_strlen($modified_url);
     }