diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php
index 7906dfc64eb82a080d0a82f84b402113720ab08d..ea3e6c61d4a03bb164944a2e8398253010d8e3a4 100644
--- a/apps/files/templates/list.php
+++ b/apps/files/templates/list.php
@@ -53,7 +53,7 @@
<span id="selectedActionsList" class="selectedActions">
<a href="" class="download">
<img class="svg" alt=""
- src="<?php print_unescaped(OCP\image_path("core", "actions/download.svg")); ?>" />
+ src="<?php print_unescaped(image_path("core", "actions/download.svg")); ?>" />
<?php p($l->t('Download'))?>
</a>
</span>
@@ -67,7 +67,7 @@
<span class="selectedActions"><a href="" class="delete-selected">
<?php p($l->t('Delete'))?>
<img class="svg" alt=""
- src="<?php print_unescaped(OCP\image_path("core", "actions/delete.svg")); ?>" />
+ src="<?php print_unescaped(image_path("core", "actions/delete.svg")); ?>" />
</a></span>
</th>
</tr>
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index e6c4f57009f2f678204dfdb6445b5cc79d328895..ae00b01dca28b8b06485e5222c4d9677236a3c67 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -81,7 +81,7 @@ $thumbSize = 1024;
</span>
<?php } ?>
<a href="<?php p($_['downloadURL']); ?>" id="download" class="button">
- <img class="svg" alt="" src="<?php print_unescaped(OCP\image_path("core", "actions/download.svg")); ?>"/>
+ <img class="svg" alt="" src="<?php print_unescaped(image_path("core", "actions/download.svg")); ?>"/>
<span id="download-text"><?php p($l->t('Download'))?></span>
</a>
</span>
@@ -105,7 +105,7 @@ $thumbSize = 1024;
<?php endif; ?>
<div class="directDownload">
<a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button">
- <img class="svg" alt="" src="<?php print_unescaped(OCP\image_path("core", "actions/download.svg")); ?>"/>
+ <img class="svg" alt="" src="<?php print_unescaped(image_path("core", "actions/download.svg")); ?>"/>
<?php p($l->t('Download %s', array($_['filename'])))?> (<?php p($_['fileSize']) ?>)
</a>
</div>
diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php
index b5c1c622156b961478007373438f827e90cf3e78..a7c1df93af2d7daf94906d7c0384c155ebfaac12 100644
--- a/apps/files_trashbin/templates/index.php
+++ b/apps/files_trashbin/templates/index.php
@@ -31,7 +31,7 @@
<span id="selectedActionsList" class='selectedActions'>
<a href="" class="undelete">
<img class="svg" alt=""
- src="<?php print_unescaped(OCP\image_path("core", "actions/history.svg")); ?>" />
+ src="<?php print_unescaped(image_path("core", "actions/history.svg")); ?>" />
<?php p($l->t('Restore'))?>
</a>
</span>
@@ -43,7 +43,7 @@
<a href="" class="delete-selected">
<?php p($l->t('Delete'))?>
<img class="svg" alt=""
- src="<?php print_unescaped(OCP\image_path("core", "actions/delete.svg")); ?>" />
+ src="<?php print_unescaped(image_path("core", "actions/delete.svg")); ?>" />
</a>
</span>
</th>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 714525cf87e279d5f2e563780f3a4d7cf2a5aaaa..7fe67159bb50ade7eefed2b048c32e4f78f85e01 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -131,7 +131,7 @@
<li id="apps-management">
<a href="<?php print_unescaped(\OC::$server->getURLGenerator()->linkToRoute('settings.AppSettings.viewApps')); ?>" tabindex="4"
<?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>>
- <img class="app-icon svg" alt="" src="<?php print_unescaped(OC_Helper::imagePath('settings', 'apps.svg')); ?>">
+ <img class="app-icon svg" alt="" src="<?php print_unescaped(image_path('settings', 'apps.svg')); ?>">
<div class="icon-loading-dark" style="display:none;"></div>
<span>
<?php p($l->t('Apps')); ?>
diff --git a/lib/private/app.php b/lib/private/app.php
index b4856f118603fc6426bb9801d86b65f90cc999f4..f49db15defea1e54d665114d302c47fdee2431dc 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -371,6 +371,7 @@ class OC_App {
*/
public static function getSettingsNavigation() {
$l = \OC::$server->getL10N('lib');
+ $urlGenerator = \OC::$server->getURLGenerator();
$settings = array();
// by default, settings only contain the help menu
@@ -381,9 +382,9 @@ class OC_App {
array(
"id" => "help",
"order" => 1000,
- "href" => \OC::$server->getURLGenerator()->linkToRoute('settings_help'),
+ "href" => $urlGenerator->linkToRoute('settings_help'),
"name" => $l->t("Help"),
- "icon" => OC_Helper::imagePath("settings", "help.svg")
+ "icon" => $urlGenerator->imagePath("settings", "help.svg")
)
);
}
@@ -394,9 +395,9 @@ class OC_App {
$settings[] = array(
"id" => "personal",
"order" => 1,
- "href" => \OC::$server->getURLGenerator()->linkToRoute('settings_personal'),
+ "href" => $urlGenerator->linkToRoute('settings_personal'),
"name" => $l->t("Personal"),
- "icon" => OC_Helper::imagePath("settings", "personal.svg")
+ "icon" => $urlGenerator->imagePath("settings", "personal.svg")
);
//SubAdmins are also allowed to access user management
@@ -410,9 +411,9 @@ class OC_App {
$settings[] = array(
"id" => "core_users",
"order" => 2,
- "href" => \OC::$server->getURLGenerator()->linkToRoute('settings_users'),
+ "href" => $urlGenerator->linkToRoute('settings_users'),
"name" => $l->t("Users"),
- "icon" => OC_Helper::imagePath("settings", "users.svg")
+ "icon" => $urlGenerator->imagePath("settings", "users.svg")
);
}
@@ -422,9 +423,9 @@ class OC_App {
$settings[] = array(
"id" => "admin",
"order" => 1000,
- "href" => \OC::$server->getURLGenerator()->linkToRoute('settings_admin'),
+ "href" => $urlGenerator->linkToRoute('settings_admin'),
"name" => $l->t("Admin"),
- "icon" => OC_Helper::imagePath("settings", "admin.svg")
+ "icon" => $urlGenerator->imagePath("settings", "admin.svg")
);
}
}
@@ -813,12 +814,12 @@ class OC_App {
$appIcon = self::getAppPath($app) . '/img/' . $app . '.svg';
if (file_exists($appIcon)) {
- $info['preview'] = OC_Helper::imagePath($app, $app . '.svg');
+ $info['preview'] = \OC::$server->getURLGenerator()->imagePath($app, $app . '.svg');
$info['previewAsIcon'] = true;
} else {
$appIcon = self::getAppPath($app) . '/img/app.svg';
if (file_exists($appIcon)) {
- $info['preview'] = OC_Helper::imagePath($app, 'app.svg');
+ $info['preview'] = \OC::$server->getURLGenerator()->imagePath($app, 'app.svg');
$info['previewAsIcon'] = true;
}
}
diff --git a/lib/private/helper.php b/lib/private/helper.php
index c387cd40a24ae371365bf167b53410cc697a8c29..495f95e72d2ba5ee33068c19a9be7248f3347eaa 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -68,19 +68,6 @@ class OC_Helper {
return $url . (($add_slash && $service[strlen($service) - 1] != '/') ? '/' : '');
}
- /**
- * Creates path to an image
- * @param string $app app
- * @param string $image image name
- * @return string the url
- * @deprecated Use \OC::$server->getURLGenerator()->imagePath($app, $image)
- *
- * Returns the path to the image.
- */
- public static function imagePath($app, $image) {
- return OC::$server->getURLGenerator()->imagePath($app, $image);
- }
-
/**
* get path to preview of file
* @param string $path path
diff --git a/lib/private/template/functions.php b/lib/private/template/functions.php
index 5c8cb72c126fa8b6381e41545a870c1990685b58..a57b3575ba935158c7d09cc7bf63a7233eece80c 100644
--- a/lib/private/template/functions.php
+++ b/lib/private/template/functions.php
@@ -138,13 +138,13 @@ function component($app, $file) {
}
/**
- * make OC_Helper::linkTo available as a simple function
+ * make \OCP\IURLGenerator::linkTo available as a simple function
* @param string $app app
* @param string $file file
* @param array $args array with param=>value, will be appended to the returned url
* @return string link to the file
*
- * For further information have a look at OC_Helper::linkTo
+ * For further information have a look at \OCP\IURLGenerator::linkTo
*/
function link_to( $app, $file, $args = array() ) {
return \OC::$server->getURLGenerator()->linkTo($app, $file, $args);
@@ -159,15 +159,15 @@ function link_to_docs($key) {
}
/**
- * make OC_Helper::imagePath available as a simple function
+ * make \OCP\IURLGenerator::imagePath available as a simple function
* @param string $app app
* @param string $image image
* @return string link to the image
*
- * For further information have a look at OC_Helper::imagePath
+ * For further information have a look at \OCP\IURLGenerator::imagePath
*/
function image_path( $app, $image ) {
- return OC_Helper::imagePath( $app, $image );
+ return \OC::$server->getURLGenerator()->imagePath( $app, $image );
}
/**
diff --git a/lib/public/template.php b/lib/public/template.php
index 35b2c26b3a0e279cb05cdbd0a6c6dfebef93f408..7e46745c9d811da53a910262154b6468b6647368 100644
--- a/lib/public/template.php
+++ b/lib/public/template.php
@@ -45,7 +45,7 @@ namespace OCP;
* @param string $image
* @return string to the image
*
- * @see OC_Helper::imagePath
+ * @see \OCP\IURLGenerator::imagePath
* @deprecated 8.0.0 Use \OCP\Template::image_path() instead
*/
function image_path( $app, $image ) {
@@ -144,7 +144,7 @@ class Template extends \OC_Template {
/**
* Make OC_Helper::imagePath available as a simple function
*
- * @see OC_Helper::imagePath
+ * @see \OCP\IURLGenerator::imagePath
*
* @param string $app
* @param string $image