From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 7 Jun 2015 15:41:18 +0000 (+0300)
Subject: fix some minor typos and stuff
X-Git-Tag: 16.3~315
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=415a3b50c9879027d5367696ef2b21200cbd5827;p=tt-rss.git

fix some minor typos and stuff
---

diff --git a/classes/db/pdo.php b/classes/db/pdo.php
index 126f5150..3aeebbe6 100644
--- a/classes/db/pdo.php
+++ b/classes/db/pdo.php
@@ -88,6 +88,7 @@ class Db_PDO implements IDb {
 			$this->query("set client_encoding = 'UTF-8'");
 			$this->query("set datestyle = 'ISO, european'");
 			$this->query("set TIME ZONE 0");
+            return;
 		case "mysql":
 			$this->query("SET time_zone = '+0:0'");
 			return;
diff --git a/classes/dlg.php b/classes/dlg.php
index e3931bc3..eee720ed 100644
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -1,8 +1,9 @@
 <?php
 class Dlg extends Handler_Protected {
 	private $param;
+    private $params;
 
-	function before($method) {
+    function before($method) {
 		if (parent::before($method)) {
 			header("Content-Type: text/html"); # required for iframe
 
diff --git a/classes/feeds.php b/classes/feeds.php
index 52c3be97..261538cd 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -3,7 +3,9 @@ require_once "colors.php";
 
 class Feeds extends Handler_Protected {
 
-	function csrf_ignore($method) {
+    private $params;
+
+    function csrf_ignore($method) {
 		$csrf_ignored = array("index", "feedbrowser", "quickaddfeed", "search");
 
 		return array_search($method, $csrf_ignored) !== false;
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index bc7d9212..6c33170b 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -127,21 +127,6 @@ class Pref_Prefs extends Handler_Protected {
 		}
 	}
 
-	function getHelp() {
-
-		$pref_name = $this->dbh->escape_string($_REQUEST["pn"]);
-
-		$result = $this->dbh->query("SELECT help_text FROM ttrss_prefs
-			WHERE pref_name = '$pref_name'");
-
-		if ($this->dbh->num_rows($result) > 0) {
-			$help_text = $this->dbh->fetch_result($result, 0, "help_text");
-			print $help_text;
-		} else {
-			printf(__("Unknown option: %s"), $pref_name);
-		}
-	}
-
 	function changeemail() {
 
 		$email = $this->dbh->escape_string($_POST["email"]);
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 38182c7a..08602c8e 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -767,7 +767,7 @@ function parse_runtime_info(data) {
 		}
 
 		if (k == "daemon_is_running" && v != 1) {
-			notify_error("<span onclick=\"javascript:explainError(1)\">Update daemon is not running.</span>", true);
+			notify_error("<span onclick=\"explainError(1)\">Update daemon is not running.</span>", true);
 			return;
 		}
 
@@ -782,7 +782,7 @@ function parse_runtime_info(data) {
 		}
 
 		if (k == "daemon_stamp_ok" && v != 1) {
-			notify_error("<span onclick=\"javascript:explainError(3)\">Update daemon is not updating feeds.</span>", true);
+			notify_error("<span onclick=\"explainError(3)\">Update daemon is not updating feeds.</span>", true);
 			return;
 		}