aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-08-15 06:05:22 -0700
committerfriendica <info@friendica.com>2014-08-15 06:05:22 -0700
commit257332f434740d974d6189d19c147722ad105a16 (patch)
tree1fbd6ab8b02a893e11a97427f74d2f1477c49068
parent1978500e8ffb8ffdffd2d2969cbafb6f43b9dde4 (diff)
parentd6da6f5001aa70681401a8b811d4e431a7831bd8 (diff)
downloadvolse-hubzilla-257332f434740d974d6189d19c147722ad105a16.tar.gz
volse-hubzilla-257332f434740d974d6189d19c147722ad105a16.tar.bz2
volse-hubzilla-257332f434740d974d6189d19c147722ad105a16.zip
Merge https://github.com/friendica/red into pending_merge
-rw-r--r--include/Contact.php2
-rw-r--r--mod/admin.php2
-rw-r--r--view/theme/redbasic/css/style.css2
3 files changed, 4 insertions, 2 deletions
diff --git a/include/Contact.php b/include/Contact.php
index 47b1763cb..140f449af 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -185,6 +185,7 @@ function account_remove($account_id,$local = true,$unset_session=true) {
$r = q("select * from account where account_id = %d limit 1",
intval($account_id)
);
+ $account_email=$r[0]['account_email'];
if(! $r) {
logger('account_remove: No account with id: ' . $account_id);
@@ -207,6 +208,7 @@ function account_remove($account_id,$local = true,$unset_session=true) {
if ($unset_session) {
unset($_SESSION['authenticated']);
unset($_SESSION['uid']);
+ notice( sprintf(t("User '%s' deleted"),$account_email) . EOL);
goaway(get_app()->get_baseurl());
}
return $r;
diff --git a/mod/admin.php b/mod/admin.php
index 230ef3011..14657bd1a 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -639,7 +639,7 @@ function admin_page_users_post(&$a){
if (x($_POST,'page_users_delete')){
require_once("include/Contact.php");
foreach($users as $uid){
- account_remove($uid,true);
+ account_remove($uid,true,false);
}
notice( sprintf( tt("%s user deleted", "%s users deleted", count($users)), count($users)) );
}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 704c2c944..889988d48 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2378,7 +2378,7 @@ blockquote {
}
.btn-xs {
- font-size: 0.65rem;
+ font-size: 0.75rem;
}
.btn-default {