diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-18 12:15:18 +0300 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-18 12:15:18 +0300 |
| commit | 551e553bf4f6cda7c559429cc6f0c40d3eb15d0b (patch) | |
| tree | f12265708d4f4c0a617252b286c6482740da8ff7 /settings | |
| parent | 1456e910adc072cc27c06623394d334dd33ad0f6 (diff) | |
| parent | 1f715289bf1cafb7e51dce7a4ab478dd3db5088e (diff) | |
Merge pull request #21264 from owncloud/deprecated_oc_user_methods
Cleanup OC_User deprecated methods
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/templates/email.new_user.php | 2 | ||||
| -rw-r--r-- | settings/users.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/settings/templates/email.new_user.php b/settings/templates/email.new_user.php index 74149632cb8..8b13ac753eb 100644 --- a/settings/templates/email.new_user.php +++ b/settings/templates/email.new_user.php @@ -4,7 +4,7 @@ <tr> <td bgcolor="<?php p($theme->getMailHeaderColor());?>" width="20px"> </td> <td bgcolor="<?php p($theme->getMailHeaderColor());?>"> - <img src="<?php p(OC_Helper::makeURLAbsolute(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($theme->getName()); ?>"/> + <img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($theme->getName()); ?>"/> </td> </tr> <tr><td colspan="2"> </td></tr> diff --git a/settings/users.php b/settings/users.php index ccf1bcd9e1a..0e9823e73e3 100644 --- a/settings/users.php +++ b/settings/users.php @@ -37,7 +37,7 @@ OC_Util::checkSubAdminUser(); \OC::$server->getNavigationManager()->setActiveEntry('core_users'); -$userManager = \OC_User::getManager(); +$userManager = \OC::$server->getUserManager(); $groupManager = \OC_Group::getManager(); // Set the sort option: SORT_USERCOUNT or SORT_GROUPNAME |