diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-07-03 14:21:51 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-07-04 10:11:16 +0200 |
| commit | 3c691c9ec9b659897f4dda3769da7049c1ed23a9 (patch) | |
| tree | 0f82fb63950245a312b0848b6200db81073f74a3 /core/templates | |
| parent | d46e62886a2b22a4c80df8cca09fb6f354d48614 (diff) | |
| download | nextcloud-server-3c691c9ec9b659897f4dda3769da7049c1ed23a9.tar.gz nextcloud-server-3c691c9ec9b659897f4dda3769da7049c1ed23a9.zip | |
move to non-static OC_Defaults
Conflicts:
lib/mail.php
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/layout.base.php | 4 | ||||
| -rw-r--r-- | core/templates/layout.guest.php | 8 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 51bac790741..09e1006d507 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -6,11 +6,11 @@ <!--[if gt IE 9]><html class="ng-csp ie"><![endif]--> <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]--> - <?php OC_Defaults::init(); // initialize themable default strings and urls ?> + <?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?> <head> <title> - <?php p(OC_Defaults::getName()); ?> + <?php p($defaults->getName()); ?> </title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" /> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index b17e2fc547c..329744e3824 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -6,11 +6,11 @@ <!--[if gt IE 9]><html class="ng-csp ie"><![endif]--> <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]--> - <?php OC_Defaults::init(); // initialize themable default strings and urls ?> + <?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?> <head data-requesttoken="<?php p($_['requesttoken']); ?>"> <title> - <?php p(OC_Defaults::getName()); ?> + <?php p($defaults->getName()); ?> </title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta name="apple-itunes-app" content="app-id=543672169"> @@ -38,13 +38,13 @@ <div id="login"> <header><div id="header"> <img src="<?php print_unescaped(image_path('', 'logo.svg')); ?>" class="svg" alt="ownCloud" /> - <div id="logo-claim" style="display:none;"><?php p(OC_Defaults::getLogoClaim()); ?></div> + <div id="logo-claim" style="display:none;"><?php p($defaults->getLogoClaim()); ?></div> </div></header> <?php print_unescaped($_['content']); ?> </div> <footer> <p class="info"> - <?php print_unescaped(OC_Defaults::getLongFooter()); ?> + <?php print_unescaped($defaults->getLongFooter()); ?> </p></footer> </body> </html> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 2dd339cef96..dacbe79bd34 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -6,12 +6,12 @@ <!--[if gt IE 9]><html class="ng-csp ie"><![endif]--> <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]--> - <?php OC_Defaults::init(); // initialize themable default strings and urls ?> + <?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?> <head data-user="<?php p($_['user_uid']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>"> <title> <?php p(!empty($_['application'])?$_['application'].' | ':''); - p(OC_Defaults::getName()); + p($defaults->getName()); p(trim($_['user_displayname']) != '' ?' ('.$_['user_displayname'].') ':'') ?> </title> <meta charset="utf-8"> @@ -46,7 +46,7 @@ <header><div id="header"> <a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg" src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="ownCloud" /></a> - <div id="logo-claim" style="display:none;"><?php p(OC_Defaults::getLogoClaim()); ?></div> + <div id="logo-claim" style="display:none;"><?php p($defaults->getLogoClaim()); ?></div> <ul id="settings" class="svg"> <span id="expand" tabindex="0" role="link"> <span id="expandDisplayName"><?php p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span> |