forked from GNUsocial/gnu-social
Extensions of GalleryActions enabled again (nickname check)
This commit is contained in:
parent
c26e08d6a6
commit
6e28524647
|
@ -17,11 +17,7 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (!defined('STATUSNET') && !defined('LACONICA')) {
|
if (!defined('GNUSOCIAL')) { exit(1); }
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
require_once INSTALLDIR.'/lib/profilelist.php';
|
|
||||||
|
|
||||||
// 10x8
|
// 10x8
|
||||||
|
|
||||||
|
@ -40,6 +36,35 @@ class GalleryAction extends ProfileAction
|
||||||
parent::handle();
|
parent::handle();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected function doPreparation()
|
||||||
|
{
|
||||||
|
// showstream requires a nickname
|
||||||
|
$nickname_arg = $this->arg('nickname');
|
||||||
|
$nickname = common_canonical_nickname($nickname_arg);
|
||||||
|
|
||||||
|
// Permanent redirect on non-canonical nickname
|
||||||
|
|
||||||
|
if ($nickname_arg != $nickname) {
|
||||||
|
$args = array('nickname' => $nickname);
|
||||||
|
if ($this->arg('page') && $this->arg('page') != 1) {
|
||||||
|
$args['page'] = $this->arg['page'];
|
||||||
|
}
|
||||||
|
common_redirect(common_local_url($this->getActionName(), $args), 301);
|
||||||
|
}
|
||||||
|
$this->user = User::getKV('nickname', $nickname);
|
||||||
|
|
||||||
|
if (!$this->user) {
|
||||||
|
$group = Local_group::getKV('nickname', $nickname);
|
||||||
|
if ($group instanceof Local_group) {
|
||||||
|
common_redirect($group->getProfile()->getUrl());
|
||||||
|
}
|
||||||
|
// TRANS: Client error displayed when calling a profile action without specifying a user.
|
||||||
|
$this->clientError(_('No such user.'), 404);
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->target = $this->user->getProfile();
|
||||||
|
}
|
||||||
|
|
||||||
function showContent()
|
function showContent()
|
||||||
{
|
{
|
||||||
$this->showTagsDropdown();
|
$this->showTagsDropdown();
|
||||||
|
|
Loading…
Reference in New Issue