Merge branch '0.7.x' of git://gitorious.org/laconica/sgmurphy-clone into sgmurphy...

diff --combined lib/util.php
index 579f964acab34ac7c248dddb607a377c2e109ad7,e96317520429d6c21213dfbbc638de85a9d4d601..330e5d12d7033c1f941540e4acc31cefdc1c7213
--- 1/lib/util.php
--- 2/lib/util.php
+++ b/lib/util.php
@@@ -447,7 -447,7 +447,7 @@@ function common_replace_urls_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);
      }
      
@@@ -937,7 -937,7 +937,7 @@@ function common_fancy_url($action, $arg
       case 'grouprss':
          return common_path('group/'.$args['nickname'].'/rss');
       case 'groupmembers':
 -        return common_path('group/'.$args['nickname'].'/members');
 +        return common_path('group/'.$args['nickname'].'/members' . (($args['page']) ? ('?page=' . $args['page']) : ''));
       case 'grouplogo':
          return common_path('group/'.$args['nickname'].'/logo');
       case 'usergroups':