summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2014-01-18 00:34:46 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2014-01-18 00:34:46 +0100
commitfb908d45577cd0f156104eb23b4b9859d40b6da2 (patch)
tree6f41e46d3e562728f77aa928737a338e05da6b69
parent781d8a717f315525807bfd702cb740248b6087ea (diff)
Corrige rafraîchissement automatique après mise-à-jour avec Persona ou formulaire
Corrige https://github.com/marienfressinaud/FreshRSS/issues/327#issuecomment-31958851
-rwxr-xr-xapp/Controllers/feedController.php1
-rw-r--r--app/views/helpers/javascript_vars.phtml3
-rw-r--r--p/i/install.php2
3 files changed, 2 insertions, 4 deletions
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index d2117f665..c40b3c400 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -164,6 +164,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
$feedDAO = new FreshRSS_FeedDAO ();
$entryDAO = new FreshRSS_EntryDAO ();
+ Minz_Session::_param('actualize_feeds', false);
$id = Minz_Request::param ('id');
$force = Minz_Request::param ('force', false);
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index 3fd5580f4..0ecdc1bca 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -42,6 +42,3 @@ echo 'str_confirmation="', Minz_Translate::t('confirm_action'), '"', ",\n";
$autoActualise = Minz_Session::param('actualize_feeds', false);
echo 'auto_actualize_feeds=', $autoActualise ? 'true' : 'false', ";\n";
-if ($autoActualise) {
- Minz_Session::_param('actualize_feeds', false);
-}
diff --git a/p/i/install.php b/p/i/install.php
index 294231fc0..18dfc1449 100644
--- a/p/i/install.php
+++ b/p/i/install.php
@@ -817,7 +817,7 @@ function printStep2 () {
<div class="form-group">
<label class="group-name" for="passwordPlain"><?php echo _t('password_form'); ?></label>
<div class="group-controls">
- <input type="password" id="passwordPlain" name="passwordPlain" pattern=".{7,}" />
+ <input type="password" id="passwordPlain" name="passwordPlain" pattern=".{7,}" autocomplete="off" />
<noscript><b><?php echo _t('javascript_should_be_activated'); ?></b></noscript>
</div>
</div>