Commit 11f2a3d5 authored by Evan Prodromou's avatar Evan Prodromou

Merge branch '1.0.x' into nummedout

parents 40924842 15ae1cdd
......@@ -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));
......
......@@ -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)));
}
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment