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-03 16:21:51 +0400 |
commit | 7bc3edae0a719b684fe7630073ad72cce1c33bde (patch) | |
tree | 6a451fdef98b9fe9f9aa56b850e513e8bf4afcd6 /settings | |
parent | f155826dc226c0456d6a13e5c8bc03228e688d71 (diff) |
move to non-static OC_Defaults
Diffstat (limited to 'settings')
-rw-r--r-- | settings/personal.php | 4 | ||||
-rw-r--r-- | settings/templates/admin.php | 6 | ||||
-rw-r--r-- | settings/templates/personal.php | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/settings/personal.php b/settings/personal.php index 3e2b7e048ed..96de05f7eef 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -8,7 +8,7 @@ OC_Util::checkLoggedIn(); OC_App::loadApps(); -OC_Defaults::init(); // initialize themable default strings and urls +$defaults = new OC_Defaults(); // initialize themable default strings and urls // Highlight navigation entry OC_Util::addScript( 'settings', 'personal' ); @@ -53,7 +53,7 @@ array_unshift($languages, $userLang); //links to clients $clients = array( - 'desktop' => OC_Config::getValue('customclient_desktop', OC_Defaults::getSyncClientUrl()), + 'desktop' => OC_Config::getValue('customclient_desktop', $defaults->getSyncClientUrl()), 'android' => OC_Config::getValue('customclient_android', 'https://play.google.com/store/apps/details?id=com.owncloud.android'), 'ios' => OC_Config::getValue('customclient_ios', 'https://itunes.apple.com/us/app/owncloud/id543672169?mt=8') ); diff --git a/settings/templates/admin.php b/settings/templates/admin.php index d289310a69b..a44db6e6d8d 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 @@ -229,7 +229,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>.')); ?> @@ -237,6 +237,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 1d704c597ba..dbb8c232c22 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> @@ -111,13 +111,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> |