diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-06-07 20:43:49 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-06-07 20:43:49 -0400 |
| commit | cf180f614207e6cdae44d1e3649a469b8982ade0 (patch) | |
| tree | e2ffae5bbc7f12577dce0a0b9a7a638df142dd18 /include/widgets.php | |
| parent | 2af8105b460d300ba41928734c960f5f70613952 (diff) | |
| parent | 67665a8b9d8ff1dbcc26a46837447544d8968784 (diff) | |
| download | volse-hubzilla-cf180f614207e6cdae44d1e3649a469b8982ade0.tar.gz volse-hubzilla-cf180f614207e6cdae44d1e3649a469b8982ade0.tar.bz2 volse-hubzilla-cf180f614207e6cdae44d1e3649a469b8982ade0.zip | |
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'include/widgets.php')
| -rw-r--r-- | include/widgets.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/widgets.php b/include/widgets.php index 5237b1a30..3ca189af0 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -799,8 +799,10 @@ function widget_photo_albums($arr) { if((! $channelx) || (! perm_is_allowed(App::$profile['profile_uid'], get_observer_hash(), 'view_storage'))) return ''; require_once('include/photos.php'); + $sortkey = ((array_key_exists('sortkey',$arr)) ? $arr['sortkey'] : 'album'); + $direction = ((array_key_exists('direction',$arr)) ? $arr['direction'] : 'asc'); - return photos_album_widget($channelx, App::get_observer()); + return photos_album_widget($channelx, App::get_observer(),$sortkey,$direction); } @@ -1450,7 +1452,7 @@ function widget_admin($arr) { $aside = array( 'site' => array(z_root() . '/admin/site/', t('Site'), 'site'), - 'users' => array(z_root() . '/admin/users/', t('Accounts'), 'users', 'pending-update', t('Member registrations waiting for confirmation')), + 'accounts' => array(z_root() . '/admin/accounts/', t('Accounts'), 'accounts', 'pending-update', t('Member registrations waiting for confirmation')), 'channels' => array(z_root() . '/admin/channels/', t('Channels'), 'channels'), 'security' => array(z_root() . '/admin/security/', t('Security'), 'security'), 'features' => array(z_root() . '/admin/features/', t('Features'), 'features'), |