diff options
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | app/Controllers/configureController.php | 1 | ||||
| -rw-r--r-- | app/views/configure/system.phtml | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 3de89e2bb..76beda475 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ * Fix crash regression when enabling extensions [#5979](https://github.com/FreshRSS/FreshRSS/pull/5979) * Fix crash regression during export when using MySQL [#5988](https://github.com/FreshRSS/FreshRSS/pull/5988) * More robust assignment of categories to feeds [#5986](https://github.com/FreshRSS/FreshRSS/pull/5986) + * Fix `base_url` being cleared when saving settings [#5992](https://github.com/FreshRSS/FreshRSS/pull/5992) * i18n * Improve simplified Chinese [#5977](https://github.com/FreshRSS/FreshRSS/pull/5977) diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php index c52a5d23c..8db36a899 100644 --- a/app/Controllers/configureController.php +++ b/app/Controllers/configureController.php @@ -485,7 +485,6 @@ class FreshRSS_configure_Controller extends FreshRSS_ActionController { FreshRSS_Context::systemConf()->title = Minz_Request::paramString('instance-name') ?: 'FreshRSS'; FreshRSS_Context::systemConf()->auto_update_url = Minz_Request::paramString('auto-update-url'); FreshRSS_Context::systemConf()->force_email_validation = Minz_Request::paramBoolean('force-email-validation'); - FreshRSS_Context::systemConf()->base_url = Minz_Request::paramString('base-url'); FreshRSS_Context::systemConf()->save(); invalidateHttpCache(); diff --git a/app/views/configure/system.phtml b/app/views/configure/system.phtml index 09d1fe188..809b869a9 100644 --- a/app/views/configure/system.phtml +++ b/app/views/configure/system.phtml @@ -25,7 +25,7 @@ <label class="group-name" for="base-url"><?= _t('admin.system.base-url') ?></label> <div class="group-controls"> <input type="text" id="base-url" name="base-url" value="<?= FreshRSS_Context::systemConf()->base_url ?>" - data-leave-validation="<?= FreshRSS_Context::systemConf()->base_url ?>" disabled="disabled" /> + data-leave-validation="<?= FreshRSS_Context::systemConf()->base_url ?>" readonly="readonly" /> <p class="help"><?= _i('help') ?> <?= _t('admin.system.base-url.recommendation', dirname(Minz_Request::guessBaseUrl())) ?></p> <p class="help"><?= _i('help') ?> <?= _t('admin.system.sensitive-parameter') ?></p> </div> |