Explorar el Código

fix: `base_url` becomes empty after saving configuration (#5992)

* fix: `base_url` becomes empty after saving configuration

* Just remove the line

* Use read-ony instead
https://developer.mozilla.org/docs/Web/HTML/Attributes/readonly#attribute_interactions

* Revert for websub

* Changelog

---------

Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
yzqzss hace 2 años
padre
commit
2bd9f63030
Se han modificado 3 ficheros con 2 adiciones y 2 borrados
  1. 1 0
      CHANGELOG.md
  2. 0 1
      app/Controllers/configureController.php
  3. 1 1
      app/views/configure/system.phtml

+ 1 - 0
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)
 

+ 0 - 1
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();

+ 1 - 1
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>