diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-18 10:15:18 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-18 10:15:18 +0100 |
| commit | 551e553bf4f6cda7c559429cc6f0c40d3eb15d0b (patch) | |
| tree | f12265708d4f4c0a617252b286c6482740da8ff7 /core | |
| parent | 1456e910adc072cc27c06623394d334dd33ad0f6 (diff) | |
| parent | 1f715289bf1cafb7e51dce7a4ab478dd3db5088e (diff) | |
| download | nextcloud-server-551e553bf4f6cda7c559429cc6f0c40d3eb15d0b.tar.gz nextcloud-server-551e553bf4f6cda7c559429cc6f0c40d3eb15d0b.zip | |
Merge pull request #21264 from owncloud/deprecated_oc_user_methods
Cleanup OC_User deprecated methods
Diffstat (limited to 'core')
| -rw-r--r-- | core/templates/internalmail.php | 2 | ||||
| -rw-r--r-- | core/templates/mail.php | 2 | ||||
| -rw-r--r-- | core/templates/untrustedDomain.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/core/templates/internalmail.php b/core/templates/internalmail.php index 0e73a601857..c2d84184d38 100644 --- a/core/templates/internalmail.php +++ b/core/templates/internalmail.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/core/templates/mail.php b/core/templates/mail.php index 0e73a601857..c2d84184d38 100644 --- a/core/templates/mail.php +++ b/core/templates/mail.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/core/templates/untrustedDomain.php b/core/templates/untrustedDomain.php index 361495636cd..46bad216822 100644 --- a/core/templates/untrustedDomain.php +++ b/core/templates/untrustedDomain.php @@ -10,7 +10,7 @@ <?php p($l->t('Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain.')); ?> <br><br> <p style="text-align:center;"> - <a href="<?php print_unescaped(OC_Helper::makeURLAbsolute(\OCP\Util::linkToRoute('settings_admin'))); ?>?trustDomain=<?php p($_['domain']); ?>" class="button"> + <a href="<?php print_unescaped(\OC::$server->getURLGenerator()->getAbsoluteURL(\OCP\Util::linkToRoute('settings_admin'))); ?>?trustDomain=<?php p($_['domain']); ?>" class="button"> <?php p($l->t('Add "%s" as trusted domain', array($_['domain']))); ?> </a> </p> |