|
From: <var...@us...> - 2021-07-02 17:39:02
|
Revision: 10346
http://sourceforge.net/p/phpwiki/code/10346
Author: vargenau
Date: 2021-07-02 17:38:55 +0000 (Fri, 02 Jul 2021)
Log Message:
-----------
Add {}
Modified Paths:
--------------
trunk/lib/WikiDB/backend/PDO.php
trunk/lib/WikiDB/backend/PearDB.php
Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php 2021-07-02 17:17:56 UTC (rev 10345)
+++ trunk/lib/WikiDB/backend/PDO.php 2021-07-02 17:38:55 UTC (rev 10346)
@@ -200,8 +200,9 @@
*/
function close()
{
- if (!$this->_dbh)
+ if (!$this->_dbh) {
return;
+ }
if ($this->_lock_count) {
trigger_error("WARNING: database still locked " .
'(lock_count = $this->_lock_count)' . "\n<br />",
@@ -280,7 +281,7 @@
return $row ? $this->_extract_page_data($row[3], $row[2]) : false;
}
- public function _extract_page_data($data, $hits)
+ public function _extract_page_data($data, $hits)
{
if (empty($data))
return array('hits' => $hits);
@@ -957,12 +958,12 @@
{
$dbh = &$this->_dbh;
extract($this->_table_names);
- $order = "DESC";
if ($limit < 0) {
$order = "ASC";
$limit = -$limit;
$where = "";
} else {
+ $order = "DESC";
$where = " AND hits > 0";
}
$orderby = '';
Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php 2021-07-02 17:17:56 UTC (rev 10345)
+++ trunk/lib/WikiDB/backend/PearDB.php 2021-07-02 17:38:55 UTC (rev 10346)
@@ -606,7 +606,9 @@
$dbh = &$this->_dbh;
extract($this->_table_names);
$orderby = $this->sortby($sortby, 'db');
- if ($orderby) $orderby = ' ORDER BY ' . $orderby;
+ if ($orderby) {
+ $orderby = ' ORDER BY ' . $orderby;
+ }
if ($exclude) { // array of pagenames
$exclude = " AND $page_tbl.pagename NOT IN " . $this->_sql_set($exclude);
} else {
@@ -667,8 +669,9 @@
$dbh = &$this->_dbh;
extract($this->_table_names);
$orderby = $this->sortby($sortby, 'db');
- if ($orderby) $orderby = ' ORDER BY ' . $orderby;
-
+ if ($orderby) {
+ $orderby = ' ORDER BY ' . $orderby;
+ }
$searchclass = get_class($this) . "_search";
// no need to define it everywhere and then fallback. memory!
if (!class_exists($searchclass))
@@ -752,11 +755,11 @@
$dbh = &$this->_dbh;
extract($this->_table_names);
if ($limit < 0) {
- $order = "hits ASC";
+ $order = "ASC";
$limit = -$limit;
$where = "";
} else {
- $order = "hits DESC";
+ $order = "DESC";
$where = " AND hits > 0";
}
$orderby = '';
@@ -764,7 +767,7 @@
if ($order = $this->sortby($sortby, 'db'))
$orderby = " ORDER BY " . $order;
} else {
- $orderby = " ORDER BY $order";
+ $orderby = " ORDER BY hits $order";
}
$sql = "SELECT "
. $this->page_tbl_fields
@@ -797,8 +800,9 @@
extract($this->_table_names);
$pick = array();
- if ($since)
+ if ($since) {
$pick[] = "mtime >= $since";
+ }
if ($include_all_revisions) {
// Include all revisions of each page.
@@ -835,8 +839,9 @@
$limit = -$limit;
}
$where_clause = $join_clause;
- if ($pick)
+ if ($pick) {
$where_clause .= " AND " . join(" AND ", $pick);
+ }
$sql = "SELECT "
. $this->page_tbl_fields . ", " . $this->version_tbl_fields
. " FROM $table"
@@ -862,10 +867,12 @@
if ($orderby = $this->sortby($sortby, 'db', array('pagename', 'wantedfrom')))
$orderby = 'ORDER BY ' . $orderby;
- if ($exclude_from) // array of pagenames
+ if ($exclude_from) { // array of pagenames
$exclude_from = " AND pp.pagename NOT IN " . $this->_sql_set($exclude_from);
- if ($exclude) // array of pagenames
+ }
+ if ($exclude) { // array of pagenames
$exclude = " AND p.pagename NOT IN " . $this->_sql_set($exclude);
+ }
$sql = "SELECT p.pagename, pp.pagename AS wantedfrom"
. " FROM $page_tbl p, $link_tbl linked"
@@ -1019,8 +1026,9 @@
*/
function _serialize($data)
{
- if (empty($data))
+ if (empty($data)) {
return '';
+ }
assert(is_array($data));
return serialize($data);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|