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

Merge branch '0.7.x' of git://gitorious.org/laconica/meitar into meitar/0.7.x

This commit is contained in:
Evan Prodromou 2009-02-04 07:25:36 -05:00
parent aafb73755e 3b6d2653fb
commit 355d438cee
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
actions/avatarsettings.php
View File

@ -316,11 +316,6 @@ class AvatarsettingsAction extends AccountSettingsAction
$profile = $user->getProfile();
$x = $this->arg('avatar_crop_x');
$y = $this->arg('avatar_crop_y');
$w = $this->arg('avatar_crop_w');
$h = $this->arg('avatar_crop_h');
$filedata = $_SESSION['FILEDATA'];
if (!$filedata) {
@ -328,6 +323,11 @@ class AvatarsettingsAction extends AccountSettingsAction
return;
}
$x = $this->arg('avatar_crop_x');
$y = $this->arg('avatar_crop_y');
$w = ($this->arg('avatar_crop_w')) ? $this->arg('avatar_crop_w') : $filedata['width'];
$h = ($this->arg('avatar_crop_h')) ? $this->arg('avatar_crop_h') : $filedata['height'];
$filepath = common_avatar_path($filedata['filename']);
if (!file_exists($filepath)) {

2
lib/util.php
View File

@ -898,7 +898,7 @@ function common_fancy_url($action, $args=null)
case 'grouprss':
return common_path('group/'.$args['nickname'].'/rss');
case 'groupmembers':
return common_path('group/'.$args['nickname'].'/members');
return common_path('group/'.$args['nickname'].'/members' . (($args['page']) ? ('?page=' . $args['page']) : ''));
case 'grouplogo':
return common_path('group/'.$args['nickname'].'/logo');
case 'usergroups':