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/configure/shortcut.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/configure/shortcut.phtml')
| -rw-r--r-- | app/views/configure/shortcut.phtml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml index dca8b6ef8..fdbeed3ea 100644 --- a/app/views/configure/shortcut.phtml +++ b/app/views/configure/shortcut.phtml @@ -9,7 +9,7 @@ <?php } ?> </datalist> - <?php $s = FreshRSS_Context::$conf->shortcuts; ?> + <?php $s = FreshRSS_Context::$user_conf->shortcuts; ?> <form method="post" action="<?php echo _url('configure', 'shortcut'); ?>"> <legend><?php echo _t('conf.shortcut'); ?></legend> |