eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

If Router is mucked up, force URI for Bookmark

Browse Source
This commit is contained in:
Evan Prodromou 2011-03-31 11:20:24 -04:00
parent 347b57f72a
commit 2411caa000
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/Bookmark/Bookmark.php
View File

@ -238,8 +238,23 @@ class Bookmark extends Memcached_DataObject
if (array_key_exists('uri', $options)) { if (array_key_exists('uri', $options)) {
$nb->uri = $options['uri']; $nb->uri = $options['uri'];
} else { } else {
$nb->uri = common_local_url('showbookmark', // FIXME: hacks to work around router bugs in
array('id' => $nb->id)); // queue daemons
$r = Router::get();
$path = $r->build('showbookmark',
array('id' => $nb->id));
if (empty($path)) {
$nb->uri = common_path('bookmark/'.$nb->id, false, false);
} else {
$nb->uri = common_local_url('showbookmark',
array('id' => $nb->id),
null,
null,
false);
}
} }
$nb->insert(); $nb->insert();