com web/master: Revert "detect if profiles are available": manage/users.php
| From: | Peter Cowburn | Date: | Mon, 26 Nov 2012 22:01:34 +0000 |
| Subject: | com web/master: Revert "detect if profiles are available": manage/users.php | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-15009@lists.php.net to get a copy of this message | ||
Commit: 2a6762d4cb9855f45bd270e4aab762427614d1ab
Author: Peter Cowburn <petercowburn@gmail.com> Mon, 26 Nov 2012 22:01:34 +0000
Parents: 746e183aa267a331e5969486e6148385c9bedc59
Branches: master
Link: http://git.php.net/?p=web/master.git;a=commitdiff;h=2a6762d4cb9855f45bd270e4aab762427614d1ab
Log:
Revert "detect if profiles are available"
This reverts commit 746e183aa267a331e5969486e6148385c9bedc59.
bjori came to the rescue by creating the table.
Changed paths:
M manage/users.php
Diff:
diff --git a/manage/users.php b/manage/users.php
index 32d2f5a..4a20c52 100644
--- a/manage/users.php
+++ b/manage/users.php
@@ -43,8 +43,6 @@ head("user administration");
db_connect();
-define('FEATURE_PROFILE_ENABLED', (bool) db_get_one('SELECT 1 FROM users_profile
LIMIT 1'));
-
# ?username=whatever will look up 'whatever' by email or username
if ($username && !$id) {
$query = "SELECT userid FROM users"
@@ -136,9 +134,7 @@ the ability to work with others.
mail($userinfo['email'],"VCS Account Request:
$userinfo[username]",$message,"From: PHP Group <group@php.net>",
"-fnoreply@php.net");
mail($mailto . ($cc ? ",$cc" : ""),$userinfo['cvsaccess'] ?
"VCS Account Deleted: $userinfo[username] deleted by $user" : "VCS Account Rejected:
$userinfo[username] rejected by $user","Nuked $userinfo[username]","From: PHP
Group <group@php.net>\nIn-Reply-To: <cvs-account-$id-admin@php.net>",
"-fnoreply@php.net");
db_query("DELETE FROM users_note WHERE userid=$id");
- if (FEATURE_PROFILE_ENABLED) {
- db_query("DELETE FROM users_profile WHERE userid=$id");
- }
+ db_query("DELETE FROM users_profile WHERE userid=$id");
if (!$noclose) {
echo '<script
language="javascript">window.close();</script>';
exit;
@@ -208,7 +204,7 @@ if ($id && $in) {
db_query($query);
}
- if(FEATURE_PROFILE_ENABLED && !empty($in['profile_markdown'])) {
+ if(!empty($in['profile_markdown'])) {
$profile_markdown = $in['profile_markdown'];
$profile_html = Markdown($profile_markdown);
$profile_markdown = mysql_real_escape_string($profile_markdown);
@@ -342,7 +338,7 @@ table.useredit tr {
Multiple keys are allowed, separated using a newline.</p></td>
</tr>
<?php
- if (FEATURE_PROFILE_ENABLED && $id) {
+ if ($id) {
$res = db_query("SELECT markdown FROM users_profile WHERE userid=$id");
$row['profile_markdown'] = '';
if ($profile_row = mysql_fetch_assoc($res)) {