GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase

Browse Source 
Conflicts:
	classes/Profile.php
This commit is contained in:
Shashi Gowda
2011-03-22 07:59:06 +05:30
parent 31c1177970 61960d3668
commit bf121a695a
39 changed files with 1444 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/router.php
View File

@@ -364,7 +364,7 @@ class Router
$m->connect('group/new', array('action' => 'newgroup'));
foreach (array('edit', 'join', 'leave', 'delete') as $v) {
foreach (array('edit', 'join', 'leave', 'delete', 'cancel', 'approve') as $v) {
$m->connect('group/:nickname/'.$v,
array('action' => $v.'group'),
array('nickname' => Nickname::DISPLAY_FMT));
@@ -391,6 +391,10 @@ class Router
array('action' => 'makeadmin'),
array('nickname' => Nickname::DISPLAY_FMT));
$m->connect('group/:nickname/members/pending',
array('action' => 'groupqueue'),
array('nickname' => Nickname::DISPLAY_FMT));
$m->connect('group/:id/id',
array('action' => 'groupbyid'),
array('id' => '[0-9]+'));