diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-10-20 18:45:22 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-10-20 18:45:22 +0200 |
| commit | 1a22a87fb1b1fcb61d201de399c33c2185dc1f6e (patch) | |
| tree | b0a9a2fb19b6cf01be8496131b4e7d552137835c /app/views/user | |
| parent | ad92dd7dae35e7205da3172d4ba35ea01da2bc8b (diff) | |
Use FreshRSS_Context::$conf only
- Replace $this->view->conf in controllers
- Replace $this->conf in views
Diffstat (limited to 'app/views/user')
| -rw-r--r-- | app/views/user/manage.phtml | 6 | ||||
| -rw-r--r-- | app/views/user/profil.phtml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml index 89c91e06c..2bfd633a2 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('language'); ?></label> <div class="group-controls"> <select name="new_user_language" id="new_user_language"> - <?php $languages = $this->conf->availableLanguages(); ?> + <?php $languages = FreshRSS_Context::$conf->availableLanguages(); ?> <?php foreach ($languages as $short => $lib) { ?> - <option value="<?php echo $short; ?>"<?php echo $this->conf->language === $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option> + <option value="<?php echo $short; ?>"<?php echo FreshRSS_Context::$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('persona_connection_email'); ?></label> - <?php $mail = $this->conf->mail_login; ?> + <?php $mail = FreshRSS_Context::$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/profil.phtml b/app/views/user/profil.phtml index a74c7b6f8..a2af53c96 100644 --- a/app/views/user/profil.phtml +++ b/app/views/user/profil.phtml @@ -42,7 +42,7 @@ <div class="form-group"> <label class="group-name" for="mail_login"><?php echo _t('persona_connection_email'); ?></label> - <?php $mail = $this->conf->mail_login; ?> + <?php $mail = FreshRSS_Context::$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('javascript_should_be_activated'); ?></b></noscript> |