From f232aa5a34f70cda01f1f3dcd087d51dee65c7ba Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 12 Aug 2015 18:24:16 +0300 Subject: [PATCH] remove num_articles from main pref_users query --- classes/pref/users.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/classes/pref/users.php b/classes/pref/users.php index e87751335..89554ba65 100644 --- a/classes/pref/users.php +++ b/classes/pref/users.php @@ -35,10 +35,6 @@ class Pref_Users extends Handler_Protected { return; } - // print "

User Details

"; - - $login = $this->dbh->fetch_result($result, 0, "login"); - print ""; $last_login = make_local_datetime( @@ -47,7 +43,6 @@ class Pref_Users extends Handler_Protected { $created = make_local_datetime( $this->dbh->fetch_result($result, 0, "created"), true); - $access_level = $this->dbh->fetch_result($result, 0, "access_level"); $stored_articles = $this->dbh->fetch_result($result, 0, "stored_articles"); print ""; @@ -59,6 +54,7 @@ class Pref_Users extends Handler_Protected { $num_feeds = $this->dbh->fetch_result($result, 0, "num_feeds"); print ""; + print ""; print "
".__('Registered')."$created
".__('Subscribed feeds count')."$num_feeds
".__('Stored articles')."$stored_articles
"; @@ -381,8 +377,7 @@ class Pref_Users extends Handler_Protected { login,access_level,email, ".SUBSTRING_FOR_DATE."(last_login,1,16) as last_login, ".SUBSTRING_FOR_DATE."(created,1,16) as created, - (SELECT COUNT(id) FROM ttrss_feeds WHERE owner_uid = tu.id) AS num_feeds, - (SELECT COUNT(ref_id) FROM ttrss_user_entries WHERE owner_uid = tu.id) AS num_articles + (SELECT COUNT(id) FROM ttrss_feeds WHERE owner_uid = tu.id) AS num_feeds FROM ttrss_users tu WHERE @@ -400,7 +395,6 @@ class Pref_Users extends Handler_Protected { ".__('Login')." ".__('Access Level')." ".__('Subscribed feeds')." - ".__('Stored articles')." ".__('Registered')." ".__('Last login').""; @@ -429,7 +423,6 @@ class Pref_Users extends Handler_Protected { print "" . $access_level_names[$line["access_level"]] . ""; print "" . $line["num_feeds"] . ""; - print "" . $line["num_articles"] . ""; print "" . $line["created"] . ""; print "" . $line["last_login"] . "";