Selaa lähdekoodia

Corrections raccourci partage

https://github.com/marienfressinaud/FreshRSS/pull/340
Alexandre Alapetite 12 vuotta sitten
vanhempi
commit
4640dd934b
2 muutettua tiedostoa jossa 4 lisäystä ja 6 poistoa
  1. 3 5
      app/views/helpers/view/normal_view.phtml
  2. 1 1
      p/scripts/main.js

+ 3 - 5
app/views/helpers/view/normal_view.phtml

@@ -7,11 +7,9 @@ if (!empty($this->entries)) {
 	$display_today = true;
 	$display_today = true;
 	$display_yesterday = true;
 	$display_yesterday = true;
 	$display_others = 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');
 	$twitter = $this->conf->sharing ('twitter');
 	$google_plus = $this->conf->sharing ('g+');
 	$google_plus = $this->conf->sharing ('g+');
 	$facebook = $this->conf->sharing ('facebook');
 	$facebook = $this->conf->sharing ('facebook');

+ 1 - 1
p/scripts/main.js

@@ -223,7 +223,7 @@ function collapse_entry() {
 function auto_share() {
 function auto_share() {
 	var share = $(".flux.current.active").find('.dropdown-target[id^="dropdown-share"]');
 	var share = $(".flux.current.active").find('.dropdown-target[id^="dropdown-share"]');
 	if (share.length) {
 	if (share.length) {
-		window.location.replace('/i/#' + share.attr('id'));
+		window.location.replace('./#' + share.attr('id'));
 	}
 	}
 }
 }