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/profile.phtml | |
| 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/profile.phtml')
| -rw-r--r-- | app/views/user/profile.phtml | 2 |
1 files changed, 1 insertions, 1 deletions
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> |