Commit e3204d24 authored by Nigel McNie's avatar Nigel McNie
Browse files

More conversions to $THEME->get_url

parent 046e62b3
......@@ -44,9 +44,9 @@ if (!$upgrades) {
die_info(get_string('noupgrades', 'admin'));
}
$loadingicon = theme_get_url('images/loading.gif');
$successicon = theme_get_url('images/success.gif');
$failureicon = theme_get_url('images/failure.gif');
$loadingicon = $THEME->get_url('images/loading.gif');
$successicon = $THEME->get_url('images/success.gif');
$failureicon = $THEME->get_url('images/failure.gif');
$loadingstring = json_encode(get_string('upgradeloading', 'admin'));
$installsuccessstring = json_encode(get_string('installsuccess', 'admin'));
......
......@@ -191,12 +191,13 @@ class Session {
* @return string The HTML representing all of the session messages.
*/
public function render_messages() {
global $THEME;
$result = '<div id="messages">';
if (isset($_SESSION['messages'])) {
foreach ($_SESSION['messages'] as $data) {
$result .= '<div class="' . $data['type'] . '">';
$result .= '<div class="fr"><a href="" onclick="removeElement(this.parentNode.parentNode);return false;">';
$result .= '<img src="' . theme_get_url('images/icon_close.gif') . '" alt="[X]"></a></div>';
$result .= '<img src="' . $THEME->get_url('images/icon_close.gif') . '" alt="[X]"></a></div>';
$result .= $data['msg'] . '</div>';
}
$_SESSION['messages'] = array();
......
......@@ -313,7 +313,7 @@ EOF;
}
}
if (defined('ADMIN') || defined('INSTITUTIONALADMIN')) {
$stylesheets[] = theme_get_url('style/admin.css');
$stylesheets[] = $THEME->get_url('style/admin.css');
}
if (get_config('developermode') & DEVMODE_DEBUGCSS) {
$stylesheets[] = get_config('wwwroot') . 'theme/debug.css';
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment