Merge branch '1.0.x' into nummedout

diff --git a/actions/showstream.php b/actions/showstream.php
index ca7af0f2ed3aea555bef898368e84d831abbf08c..ee8bc18e72ffeb8cc97c6e52fc33b92bcf7991db 100644 (file)
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -92,9 +92,6 @@ class ShowstreamAction extends ProfileAction
 
         // For YADIS discovery, we also have a <meta> tag
 
-        header('X-XRDS-Location: '. common_local_url('xrds', array('nickname' =>
-                                                                   $this->user->nickname)));
-
         $this->showPage();
     }
 
@@ -171,11 +168,6 @@ class ShowstreamAction extends ProfileAction
 
     function extraHead()
     {
-        // for remote subscriptions etc.
-        $this->element('meta', array('http-equiv' => 'X-XRDS-Location',
-                                     'content' => common_local_url('xrds', array('nickname' =>
-                                                                                 $this->user->nickname))));
-
         if ($this->profile->bio) {
             $this->element('meta', array('name' => 'description',
                                          'content' => $this->profile->bio));

diff --git a/lib/util.php b/lib/util.php
index 3658e3ceea2e6a3ad19a12ed8723ee9b6df21ac0..49764f86a5fe40cc32effaa60a75fb682547202c 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -2312,3 +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)));
+}

diff --git a/plugins/Directory/DirectoryPlugin.php b/plugins/Directory/DirectoryPlugin.php
index ad7fc82049e3438dba053335839db995c5095d66..06cfca02efa5a54492009fc251157a8774eb4958 100644 (file)
--- a/plugins/Directory/DirectoryPlugin.php
+++ b/plugins/Directory/DirectoryPlugin.php
@@ -132,6 +132,11 @@ class DirectoryPlugin extends Plugin
             array('filter' => '([0-9a-zA-Z_]{1,64}|0-9)')
         );
 
+        $m->connect(
+            'groups',
+            array('action' => 'groupdirectory')
+        );
+
         return true;
     }