Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@owncloud.com>2015-12-17 15:03:37 +0300
committerRoeland Jago Douma <rullzer@owncloud.com>2015-12-17 18:18:34 +0300
commit7e44ea5da068bae204715e545b95c4852ad6283c (patch)
treecb69da44fbd42bfeae6a50d8bb46c9b5eddf9fda /settings
parentd402ac91d70ead3e2824c2630904a9add51249e3 (diff)
Remove deprecated function OC_User::getManager
Private deprecated function => removed Replaced all instances with suggested replacement
Diffstat (limited to 'settings')
-rw-r--r--settings/templates/email.new_user.php2
-rw-r--r--settings/users.php2
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">&nbsp;</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">&nbsp;</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