diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-07-03 16:21:51 +0400 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-07-04 12:11:16 +0400 |
| commit | 3c691c9ec9b659897f4dda3769da7049c1ed23a9 (patch) | |
| tree | 0f82fb63950245a312b0848b6200db81073f74a3 /settings/templates | |
| parent | d46e62886a2b22a4c80df8cca09fb6f354d48614 (diff) | |
move to non-static OC_Defaults
Conflicts:
lib/mail.php
Diffstat (limited to 'settings/templates')
| -rw-r--r-- | settings/templates/admin.php | 6 | ||||
| -rw-r--r-- | settings/templates/personal.php | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/settings/templates/admin.php b/settings/templates/admin.php index fd79f88af1c..6b211b957dc 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -5,7 +5,7 @@ */ $levels = array('Debug', 'Info', 'Warning', 'Error', 'Fatal'); -OC_Defaults::init(); // initialize themable default strings and urls +$defaults = new OC_Defaults(); // initialize themable default strings and urls ?> <?php @@ -234,7 +234,7 @@ endfor;?> <fieldset class="personalblock"> <legend><strong><?php p($l->t('Version'));?></strong></legend> - <strong><?php p(OC_Defaults::getName()); ?></strong> <?php p(OC_Util::getVersionString()); ?> + <strong><?php p($defaults->getName()); ?></strong> <?php p(OC_Util::getVersionString()); ?> <?php if (OC_Util::getEditionString() === ''): ?> (<?php print_unescaped(OC_Updater::ShowUpdatingHint()); ?>)<br/> <?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?> @@ -242,6 +242,6 @@ endfor;?> </fieldset> <fieldset class="personalblock credits-footer"> <p> - <?php print_unescaped(OC_Defaults::getShortFooter()); ?> + <?php print_unescaped($defaults->getShortFooter()); ?> </p> </fieldset> diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 4cf2b2393b3..d4396407525 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -4,7 +4,7 @@ * See the COPYING-README file. */?> -<?php OC_Defaults::init(); // initialize themable default strings and urls ?> +<?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?> <div class="clientsbox"> <h2><?php p($l->t('Get the apps to sync your files'));?></h2> @@ -114,13 +114,13 @@ if($_['passwordChangeSupported']) { <fieldset class="personalblock"> <legend><strong><?php p($l->t('Version'));?></strong></legend> - <strong><?php p(OC_Defaults::getName()); ?></strong> <?php p(OC_Util::getVersionString()); ?><br/> + <strong><?php p($defaults->getName()); ?></strong> <?php p(OC_Util::getVersionString()); ?><br/> <?php if (OC_Util::getEditionString() === ''): ?> <?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?> <?php endif; ?> </fieldset> <fieldset class="personalblock credits-footer"> <p> - <?php print_unescaped(OC_Defaults::getShortFooter()); ?> + <?php print_unescaped($defaults->getShortFooter()); ?> </p> </fieldset> |