diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-02-04 07:25:36 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-02-04 07:25:36 -0500 |
| commit | 355d438ceebc35ae98593a9a80a817ccaa441643 (patch) | |
| tree | e1444f6994069f10a49f54f113d435cf329a09b6 | |
| parent | aafb73755e7fbeb1b0e4198ce727c3ee1c8a5c94 (diff) | |
| parent | 3b6d2653fb82271771d5889e63275666409b0eb1 (diff) | |
Merge branch '0.7.x' of git://gitorious.org/laconica/meitar into meitar/0.7.x
| -rw-r--r-- | actions/avatarsettings.php | 10 | ||||
| -rw-r--r-- | lib/util.php | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php index 19f53b882..3029b0621 100644 --- a/actions/avatarsettings.php +++ b/actions/avatarsettings.php @@ -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)) { diff --git a/lib/util.php b/lib/util.php index 07e124811..8f93a8319 100644 --- a/lib/util.php +++ b/lib/util.php @@ -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': |