diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-09-25 18:42:36 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-09-25 18:42:36 +0000 |
| commit | 191b513315fb7f0ab2b8e5c291b092fc72c8a36c (patch) | |
| tree | 10a4c7a2eb2347320022b50b06679db6cffc70f7 | |
| parent | d4f9010741a623d7f6115f45163e4dedffd89551 (diff) | |
| download | forums-191b513315fb7f0ab2b8e5c291b092fc72c8a36c.tar forums-191b513315fb7f0ab2b8e5c291b092fc72c8a36c.tar.gz forums-191b513315fb7f0ab2b8e5c291b092fc72c8a36c.tar.bz2 forums-191b513315fb7f0ab2b8e5c291b092fc72c8a36c.tar.xz forums-191b513315fb7f0ab2b8e5c291b092fc72c8a36c.zip | |
Forgot to ftp again ...
git-svn-id: file:///svn/phpbb/trunk@1085 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/admin/admin_board.php | 12 | ||||
| -rw-r--r-- | phpBB/includes/constants.php | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/admin/admin_board.php b/phpBB/admin/admin_board.php index d39b0c28a3..78a71c9b2a 100644 --- a/phpBB/admin/admin_board.php +++ b/phpBB/admin/admin_board.php @@ -73,9 +73,9 @@ $html_yes = ($new['allow_html']) ? "checked=\"checked\"" : ""; $html_no = (!$new['allow_html']) ? "checked=\"checked\"" : ""; $bbcode_yes = ($new['allow_bbcode']) ? "checked=\"checked\"" : ""; $bbcode_no = (!$new['allow_bbcode']) ? "checked=\"checked\"" : ""; -$activation_none = ($new['require_activation'] == ACTIVATION_NONE) ? "checked=\"checked\"" : ""; -$activation_user = ($new['require_activation'] == ACTIVATION_USER) ? "checked=\"checked\"" : ""; -$activation_admin = ($new['require_activation'] == ACTIVATION_ADMIN) ? "checked=\"checked\"" : ""; +$activation_none = ($new['require_activation'] == USER_ACTIVATION_NONE) ? "checked=\"checked\"" : ""; +$activation_user = ($new['require_activation'] == USER_ACTIVATION_SELF) ? "checked=\"checked\"" : ""; +$activation_admin = ($new['require_activation'] == USER_ACTIVATION_ADMIN) ? "checked=\"checked\"" : ""; $gzip_yes = ($new['gzip_compress']) ? "checked=\"checked\"" : ""; $gzip_no = (!$new['gzip_compress']) ? "checked=\"checked\"" : ""; $prune_yes = ($new['prune_enable']) ? "checked=\"checked\"" : ""; @@ -102,11 +102,11 @@ $template->set_filenames(array( $template->assign_vars(array( "S_CONFIG_ACTION" => append_sid("admin_board.$phpEx"), "SITENAME" => $new['sitename'], - "ACTIVATION_NONE" => ACTIVATION_NONE, + "ACTIVATION_NONE" => USER_ACTIVATION_NONE, "ACTIVATION_NONE_CHECKED" => $activation_none, - "ACTIVATION_USER" => ACTIVATION_USER, + "ACTIVATION_USER" => USER_ACTIVATION_SELF, "ACTIVATION_USER_CHECKED" => $activation_user, - "ACTIVATION_ADMIN" => ACTIVATION_ADMIN, + "ACTIVATION_ADMIN" => USER_ACTIVATION_ADMIN, "ACTIVATION_ADMIN_CHECKED" => $activation_admin, "FLOOD_INTERVAL" => $new['flood_interval'], "TOPICS_PER_PAGE" => $new['topics_per_page'], diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index f760c0abfd..14b86d640f 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -38,7 +38,7 @@ define(ADMIN, 1); // User Activation define(USER_ACTIVATION_NONE, 0); -define(USER_ACTIVATION_USER, 1); +define(USER_ACTIVATION_SELF, 1); define(USER_ACTIVATION_ADMIN, 2); |