summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2014-01-03 14:14:42 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2014-01-03 14:14:42 +0100
commit4640dd934b4cfe43d67abdf05e27d279953592af (patch)
tree306ce1cfa2b9cd6281a6eb47bddcbc85ced52ded
parentc4ad9c531bbbbf49119802596949a17861510afe (diff)
Corrections raccourci partage
https://github.com/marienfressinaud/FreshRSS/pull/340
-rw-r--r--app/views/helpers/view/normal_view.phtml8
-rw-r--r--p/scripts/main.js2
2 files changed, 4 insertions, 6 deletions
diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml
index 50afa6903..ce036e281 100644
--- a/app/views/helpers/view/normal_view.phtml
+++ b/app/views/helpers/view/normal_view.phtml
@@ -7,11 +7,9 @@ if (!empty($this->entries)) {
$display_today = true;
$display_yesterday = true;
$display_others = true;
- if ($this->loginOk) {
- $shaarli = $this->conf->sharing ('shaarli');
- $poche = $this->conf->sharing ('poche');
- $diaspora = $this->conf->sharing ('diaspora');
- }
+ $shaarli = $this->loginOk && $this->conf->sharing ('shaarli');
+ $poche = $this->loginOk && $this->conf->sharing ('poche');
+ $diaspora = $this->loginOk && $this->conf->sharing ('diaspora');
$twitter = $this->conf->sharing ('twitter');
$google_plus = $this->conf->sharing ('g+');
$facebook = $this->conf->sharing ('facebook');
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 43b0384e8..dbd484473 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -223,7 +223,7 @@ function collapse_entry() {
function auto_share() {
var share = $(".flux.current.active").find('.dropdown-target[id^="dropdown-share"]');
if (share.length) {
- window.location.replace('/i/#' + share.attr('id'));
+ window.location.replace('./#' + share.attr('id'));
}
}