diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-01-05 22:43:15 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-01-05 22:45:03 +0100 |
| commit | 7cca47d1ab5838f5440b1a1e08fa4c0d43989664 (patch) | |
| tree | b51ae930a11afd4c9622c27c1926310f980d294e /app/views/user | |
| parent | 51a71ec4b9d62528054be8faee1576a8fd6d37f6 (diff) | |
Change name of user configuration var in Context
- FreshRSS_Context::$conf is replaced by FreshRSS_Context::$user_conf
- Introduce FreshRSS_Context::$system_conf
- Remove FreshRSS_Configuration object
See https://github.com/FreshRSS/FreshRSS/issues/730
Diffstat (limited to 'app/views/user')
| -rw-r--r-- | app/views/user/manage.phtml | 6 | ||||
| -rw-r--r-- | app/views/user/profile.phtml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml index b175d48df..6e472ca0b 100644 --- a/app/views/user/manage.phtml +++ b/app/views/user/manage.phtml @@ -10,9 +10,9 @@ <label class="group-name" for="new_user_language"><?php echo _t('admin.user.language'); ?></label> <div class="group-controls"> <select name="new_user_language" id="new_user_language"> - <?php $languages = FreshRSS_Context::$conf->availableLanguages(); ?> + <?php $languages = FreshRSS_Context::$user_conf->availableLanguages(); ?> <?php foreach ($languages as $short => $lib) { ?> - <option value="<?php echo $short; ?>"<?php echo FreshRSS_Context::$conf->language === $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option> + <option value="<?php echo $short; ?>"<?php echo FreshRSS_Context::$user_conf->language === $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option> <?php } ?> </select> </div> @@ -38,7 +38,7 @@ <div class="form-group"> <label class="group-name" for="new_user_email"><?php echo _t('admin.user.email_persona'); ?></label> - <?php $mail = FreshRSS_Context::$conf->mail_login; ?> + <?php $mail = FreshRSS_Context::$user_conf->mail_login; ?> <div class="group-controls"> <input type="email" id="new_user_email" name="new_user_email" class="extend" autocomplete="off" placeholder="alice@example.net" /> </div> diff --git a/app/views/user/profile.phtml b/app/views/user/profile.phtml index fc9b24674..a3f7bf15d 100644 --- a/app/views/user/profile.phtml +++ b/app/views/user/profile.phtml @@ -42,7 +42,7 @@ <div class="form-group"> <label class="group-name" for="mail_login"><?php echo _t('conf.profile.email_persona'); ?></label> - <?php $mail = FreshRSS_Context::$conf->mail_login; ?> + <?php $mail = FreshRSS_Context::$user_conf->mail_login; ?> <div class="group-controls"> <input type="email" id="mail_login" name="mail_login" class="extend" autocomplete="off" value="<?php echo $mail; ?>" <?php echo FreshRSS_Auth::hasAccess('admin') ? '' : 'disabled="disabled"'; ?> placeholder="alice@example.net" /> <noscript><b><?php echo _t('gen.js.should_be_activated'); ?></b></noscript> |