L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-71099 Lib: Move new user_fields class from core to core_user

Browse Source 
This class would belong more appropriately within the 'user' API
(core_user) instead of within the 'core' API, since it is
directly related to user data.

Since the class has only just been added to Moodle, now is a good
time to move it.
This commit is contained in:
sam marshall
2021-03-25 13:48:04 +00:00
parent c54de9bec2
commit 3dee5cd74c
161 changed files with 420 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files
message/classes/api.php
+4 -4
View File
@@ -111,7 +111,7 @@ class api {
global $DB;
// Get the user fields we want.
$userfieldsapi = \core\user_fields::for_userpic()->including('lastaccess');
$userfieldsapi = \core_user\fields::for_userpic()->including('lastaccess');
$ufields = $userfieldsapi->get_sql('u', false, 'userfrom_', '', false)->selects;
$ufields2 = $userfieldsapi->get_sql('u2', false, 'userto_', '', false)->selects;
// Add the uniqueid column to make each row unique and avoid SQL errors.
@@ -1023,7 +1023,7 @@ class api {
debugging('\core_message\api::get_contacts_with_unread_message_count is deprecated and no longer used',
DEBUG_DEVELOPER);
$userfieldsapi = \core\user_fields::for_userpic()->including('lastaccess');
$userfieldsapi = \core_user\fields::for_userpic()->including('lastaccess');
$userfields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$unreadcountssql = "SELECT $userfields, count(m.id) as messagecount
FROM {message_contacts} mc
@@ -1065,7 +1065,7 @@ class api {
debugging('\core_message\api::get_non_contacts_with_unread_message_count is deprecated and no longer used',
DEBUG_DEVELOPER);
$userfieldsapi = \core\user_fields::for_userpic()->including('lastaccess');
$userfieldsapi = \core_user\fields::for_userpic()->including('lastaccess');
$userfields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$unreadcountssql = "SELECT $userfields, count(m.id) as messagecount
FROM {user} u
@@ -1888,7 +1888,7 @@ class api {
public static function get_blocked_users($userid) {
global $DB;
$userfieldsapi = \core\user_fields::for_userpic()->including('lastaccess');
$userfieldsapi = \core_user\fields::for_userpic()->including('lastaccess');
$userfields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$blockeduserssql = "SELECT $userfields
FROM {message_users_blocked} mub