Merge branch '1.0.x' into nummedout

diff --combined lib/util.php
index 3658e3ceea2e6a3ad19a12ed8723ee9b6df21ac0,f25bae38ccaddcbb0190017f1ef7aadb89053bfc..49764f86a5fe40cc32effaa60a75fb682547202c
--- 1/lib/util.php
--- 2/lib/util.php
+++ b/lib/util.php
@@@ -1237,12 -1237,12 +1237,12 @@@ function common_local_url($action, $arg
          $ssl = common_is_sensitive($action);
  
          if (common_config('site','fancy')) {
 -            $url = common_path(mb_substr($path, 1), $ssl, $addSession);
 +            $url = common_path($path, $ssl, $addSession);
          } else {
              if (mb_strpos($path, '/index.php') === 0) {
 -                $url = common_path(mb_substr($path, 1), $ssl, $addSession);
 +                $url = common_path($path, $ssl, $addSession);
              } else {
 -                $url = common_path('index.php'.$path, $ssl, $addSession);
 +                $url = common_path('index.php/'.$path, $ssl, $addSession);
              }
          }
          Event::handle('EndLocalURL', array(&$action, &$params, &$fragment, &$addSession, &$url));
@@@ -2312,3 -2312,31 +2312,31 @@@ function common_is_email($str
  {
      return (strpos($str, '@') !== false);
  }
+ 
+ function common_init_stats()
+ {
+     global $_mem, $_ts;
+ 
+     $_mem = memory_get_usage(true);
+     $_ts  = microtime(true);
+ }
+ 
+ function common_log_delta($comment=null)
+ {
+     global $_mem, $_ts;
+ 
+     $mold = $_mem;
+     $told = $_ts;
+ 
+     $_mem = memory_get_usage(true);
+     $_ts  = microtime(true);
+ 
+     $mtotal = $_mem - $mold;
+     $ttotal = $_ts - $told;
+ 
+     if (empty($comment)) {
+         $comment = 'Delta';
+     }
+ 
+     common_debug(sprintf("%s: %d %d", $comment, $mtotal, round($ttotal * 1000000)));
+ }