summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/files/appinfo/app.php2
-rw-r--r--apps/user_ldap/templates/part.settingcontrols.php4
-rw-r--r--apps/user_ldap/templates/part.wizardcontrols.php4
-rw-r--r--apps/user_ldap/templates/settings.php2
-rw-r--r--core/templates/login.php2
-rw-r--r--core/templates/lostpassword/resetpassword.php2
-rw-r--r--settings/templates/personal.php6
7 files changed, 11 insertions, 11 deletions
diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php
index 94360786ac3..174531bdfcc 100644
--- a/apps/files/appinfo/app.php
+++ b/apps/files/appinfo/app.php
@@ -34,7 +34,7 @@
'id' => 'files_index',
'order' => 0,
'href' => $urlGenerator->linkToRoute('files.view.index'),
- 'icon' => \OCP\Util::imagePath('core', 'places/files.svg'),
+ 'icon' => $urlGenerator->imagePath('core', 'places/files.svg'),
'name' => $l->t('Files'),
];
});
diff --git a/apps/user_ldap/templates/part.settingcontrols.php b/apps/user_ldap/templates/part.settingcontrols.php
index fb5deb1897d..4dc57eae6d2 100644
--- a/apps/user_ldap/templates/part.settingcontrols.php
+++ b/apps/user_ldap/templates/part.settingcontrols.php
@@ -2,9 +2,9 @@
<button type="button" class="ldap_action_test_connection" name="ldap_action_test_connection">
<?php p($l->t('Test Configuration'));?>
</button>
- <a href="<?php p(\OC::$server->getURLGenerator()->linkToDocs('admin-ldap')); ?>"
+ <a href="<?php p(link_to_docs('admin-ldap')); ?>"
target="_blank" rel="noreferrer">
- <img src="<?php print_unescaped(OCP\Util::imagePath('', 'actions/info.png')); ?>"
+ <img src="<?php print_unescaped(image_path('', 'actions/info.png')); ?>"
style="height:1.75ex" />
<?php p($l->t('Help'));?>
</a>
diff --git a/apps/user_ldap/templates/part.wizardcontrols.php b/apps/user_ldap/templates/part.wizardcontrols.php
index 19d6de94ebe..4760aa0d8ef 100644
--- a/apps/user_ldap/templates/part.wizardcontrols.php
+++ b/apps/user_ldap/templates/part.wizardcontrols.php
@@ -8,9 +8,9 @@
<button class="ldap_action_continue" name="ldap_action_continue" type="button">
<?php p($l->t('Continue'));?>
</button>
- <a href="<?php p(\OC::$server->getURLGenerator()->linkToDocs('admin-ldap')); ?>"
+ <a href="<?php p(link_to_docs('admin-ldap')); ?>"
target="_blank" rel="noreferrer">
- <img src="<?php print_unescaped(OCP\Util::imagePath('', 'actions/info.png')); ?>"
+ <img src="<?php print_unescaped(image_path('', 'actions/info.png')); ?>"
style="height:1.75ex" />
<span class="ldap_grey"><?php p($l->t('Help'));?></span>
</a>
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 23e6d5591a9..bae16691ba0 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -120,5 +120,5 @@ style('user_ldap', 'settings');
</fieldset>
</div>
<!-- Spinner Template -->
- <img class="ldapSpinner hidden" src="<?php p(\OCP\Util::imagePath('core', 'loading.gif')); ?>">
+ <img class="ldapSpinner hidden" src="<?php p(image_path('core', 'loading.gif')); ?>">
</form>
diff --git a/core/templates/login.php b/core/templates/login.php
index ef89d227d24..9934d4988d9 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -33,7 +33,7 @@ script('core', [
<?php endif; ?>
<div id="message" class="hidden">
<img class="float-spinner" alt=""
- src="<?php p(\OCP\Util::imagePath('core', 'loading-dark.gif'));?>">
+ src="<?php p(image_path('core', 'loading-dark.gif'));?>">
<span id="messageText"></span>
<!-- the following div ensures that the spinner is always inside the #message div -->
<div style="clear: both;"></div>
diff --git a/core/templates/lostpassword/resetpassword.php b/core/templates/lostpassword/resetpassword.php
index 49ced424648..02e82fe6947 100644
--- a/core/templates/lostpassword/resetpassword.php
+++ b/core/templates/lostpassword/resetpassword.php
@@ -34,7 +34,7 @@ script('core', 'lostpassword');
</p>
<input type="submit" id="submit" value="<?php p($l->t('Reset password')); ?>" />
<p class="text-center">
- <img class="hidden" id="float-spinner" src="<?php p(\OCP\Util::imagePath('core', 'loading-dark.gif'));?>"/>
+ <img class="hidden" id="float-spinner" src="<?php p(image_path('core', 'loading-dark.gif'));?>"/>
</p>
</fieldset>
</form>
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 302feddcb42..29bf240e7e3 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -170,15 +170,15 @@ if($_['passwordChangeSupported']) {
<div id="clientsbox" class="section clientsbox">
<h2><?php p($l->t('Get the apps to sync your files'));?></h2>
<a href="<?php p($_['clients']['desktop']); ?>" rel="noreferrer" target="_blank">
- <img src="<?php print_unescaped(OCP\Util::imagePath('core', 'desktopapp.svg')); ?>"
+ <img src="<?php print_unescaped(image_path('core', 'desktopapp.svg')); ?>"
alt="<?php p($l->t('Desktop client'));?>" />
</a>
<a href="<?php p($_['clients']['android']); ?>" rel="noreferrer" target="_blank">
- <img src="<?php print_unescaped(OCP\Util::imagePath('core', 'googleplay.png')); ?>"
+ <img src="<?php print_unescaped(image_path('core', 'googleplay.png')); ?>"
alt="<?php p($l->t('Android app'));?>" />
</a>
<a href="<?php p($_['clients']['ios']); ?>" rel="noreferrer" target="_blank">
- <img src="<?php print_unescaped(OCP\Util::imagePath('core', 'appstore.svg')); ?>"
+ <img src="<?php print_unescaped(image_path('core', 'appstore.svg')); ?>"
alt="<?php p($l->t('iOS app'));?>" />
</a>