diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2005-12-19 18:55:52 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2005-12-19 18:55:52 +0000 |
| commit | 1855c017e95795966149c6c265a7588f8f5ad19e (patch) | |
| tree | 63862425f20f4c478cf4fd3effbcfeb9572c846a /phpBB/includes/ucp | |
| parent | 738bf09f92d6c268c71c8f38311c8af7d2659db1 (diff) | |
| download | forums-1855c017e95795966149c6c265a7588f8f5ad19e.tar forums-1855c017e95795966149c6c265a7588f8f5ad19e.tar.gz forums-1855c017e95795966149c6c265a7588f8f5ad19e.tar.bz2 forums-1855c017e95795966149c6c265a7588f8f5ad19e.tar.xz forums-1855c017e95795966149c6c265a7588f8f5ad19e.zip | |
- drop in the new administration panel
- not finished yet: some user related items, style admin, database admin and permissions
- Graham: Please add your MCP schema data to the schema data file. ;)
git-svn-id: file:///svn/phpbb/trunk@5357 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_prefs.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/includes/ucp/ucp_pm.php b/phpBB/includes/ucp/ucp_pm.php index b1ffc4f79b..b4639c1788 100644 --- a/phpBB/includes/ucp/ucp_pm.php +++ b/phpBB/includes/ucp/ucp_pm.php @@ -402,7 +402,7 @@ class ucp_pm_info 'unread' => array('title' => 'UCP_PM_UNREAD', 'auth' => 'cfg_allow_privmsg'), 'drafts' => array('title' => 'UCP_PM_DRAFTS', 'auth' => 'cfg_allow_privmsg'), 'options' => array('title' => 'UCP_PM_OPTIONS', 'auth' => 'cfg_allow_privmsg'), - 'popup' => array('title' => 'UCP_PM_POPUP_TITLE', 'auth' => 'cfg_allow_privmsg', 'display' => 0), + 'popup' => array('title' => 'UCP_PM_POPUP_TITLE', 'auth' => 'cfg_allow_privmsg', 'display' => false), ), ); } diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php index ae8f143817..a1888179c1 100644 --- a/phpBB/includes/ucp/ucp_prefs.php +++ b/phpBB/includes/ucp/ucp_prefs.php @@ -169,7 +169,7 @@ class ucp_prefs 'NOTIFY_IM' => ($notifymethod == NOTIFY_IM) ? 'checked="checked"' : '', 'NOTIFY_BOTH' => ($notifymethod == NOTIFY_BOTH) ? 'checked="checked"' : '', - 'DATE_FORMAT' => $dateformat, + 'DATE_FORMAT' => $dateformat, 'S_DATEFORMAT_OPTIONS' => $dateformat_options, 'S_CUSTOM_DATEFORMAT' => $s_custom, 'DEFAULT_DATEFORMAT' => $config['default_dateformat'], @@ -256,7 +256,7 @@ class ucp_prefs $error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error); } - $topic_sk = (isset($topic_sk)) ? $topic_sk : ((!empty($user->data['user_tpic_sortby_type'])) ? $user->data['user_topic_sortby_type'] : 't'); + $topic_sk = (isset($topic_sk)) ? $topic_sk : ((!empty($user->data['user_topic_sortby_type'])) ? $user->data['user_topic_sortby_type'] : 't'); $post_sk = (isset($post_sk)) ? $post_sk : ((!empty($user->data['user_post_sortby_type'])) ? $user->data['user_post_sortby_type'] : 't'); $topic_sd = (isset($topic_sd)) ? $topic_sd : ((!empty($user->data['user_topic_sortby_dir'])) ? $user->data['user_topic_sortby_dir'] : 'd'); diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 5881f15bf7..df1370e073 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -522,7 +522,8 @@ class ucp_profile } else if ($delete && $auth->acl_get('u_chgavatar')) { - $type = $filename = $width = $height = ''; + $filename = ''; + $type = $width = $height = 0; } } |