diff options
| author | Andrew Dolgov <[email protected]> | 2011-12-13 15:08:07 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2011-12-13 15:08:07 +0400 |
| commit | d043c0069ed6e7e33e5ee019eca725fa4029ef1e (patch) | |
| tree | 258ff28f95fa10e55af5bfb47168c12f85bf97dd /include/db.php | |
| parent | 43dd8898bd8d82d526b6d56b9f6b2afd53af9162 (diff) | |
| parent | 80edb8b4d7002edffbf26da4bf98c51e32dd51b6 (diff) | |
Merge branch 'tiny-oop'
Diffstat (limited to 'include/db.php')
| -rw-r--r-- | include/db.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/db.php b/include/db.php index 0682b58f8..1401c089b 100644 --- a/include/db.php +++ b/include/db.php @@ -53,7 +53,7 @@ function db_escape_string($s, $strip_tags = true) { function db_query($link, $query, $die_on_error = true) { //if ($_REQUEST["qlog"]) - // error_log($_SESSION["uid"] . ":" . $_REQUEST["op"] . "/" . $_REQUEST["subop"] . + // error_log($_SESSION["uid"] . ":" . $_REQUEST["op"] . "/" . $_REQUEST["method"] . // " $query\n", 3, "/tmp/ttrss-query.log"); if (DB_TYPE == "pgsql") { @@ -61,7 +61,7 @@ function db_query($link, $query, $die_on_error = true) { if (!$result) { $query = htmlspecialchars($query); // just in case if ($die_on_error) { - die("Query <i>$query</i> failed [$result]: " . pg_last_error($link)); + die("Query <i>$query</i> failed [$result]: " . ($link ? pg_last_error($link) : "No connection")); } } return $result; @@ -70,7 +70,7 @@ function db_query($link, $query, $die_on_error = true) { if (!$result) { $query = htmlspecialchars($query); if ($die_on_error) { - die("Query <i>$query</i> failed: " . mysql_error($link)); + die("Query <i>$query</i> failed: " . ($link ? mysql_error($link) : "No connection")); } } return $result; |