This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 601bc87aeb80c979d1bbdcdfe84ff48f01c9cb2e (commit)
via d9eb1549f4c7fd0f01c48507f053fdd4405daf2b (commit)
from 56d6e952d48fd29028192db4c2d2f406ccaac7af (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 601bc87aeb80c979d1bbdcdfe84ff48f01c9cb2e
Merge: d9eb154 56d6e95
Author: Marc-Etienne Vargenau <[email protected]>
Date: Wed Jul 9 10:43:15 2014 +0200
Merge branch 'master' of
git+ssh://scm.fusionforge.org//scmrepos/git/fusionforge/fusionforge
commit d9eb1549f4c7fd0f01c48507f053fdd4405daf2b
Author: Marc-Etienne Vargenau <[email protected]>
Date: Wed Jul 9 10:43:00 2014 +0200
wiki: fetchSingle was renamed to fetchColumn
diff --git a/src/plugins/wiki/www/lib/DbSession/PDO.php
b/src/plugins/wiki/www/lib/DbSession/PDO.php
index be0083e..26a682f 100644
--- a/src/plugins/wiki/www/lib/DbSession/PDO.php
+++ b/src/plugins/wiki/www/lib/DbSession/PDO.php
@@ -100,7 +100,7 @@ class DbSession_PDO
$table = $this->_table;
$sth = $dbh->prepare("SELECT sess_data FROM $table WHERE sess_id=?");
$sth->bindParam(1, $id, PDO_PARAM_STR, 32);
- if ($sth->execute()) $res = $sth->fetchSingle();
+ if ($sth->execute()) $res = $sth->fetchColumn();
else $res = '';
$this->_disconnect();
if (!empty($res) and isa($dbh, 'ADODB_postgres64'))
diff --git a/src/plugins/wiki/www/lib/WikiDB/backend/PDO.php
b/src/plugins/wiki/www/lib/WikiDB/backend/PDO.php
index 245b09c..92c0265 100644
--- a/src/plugins/wiki/www/lib/WikiDB/backend/PDO.php
+++ b/src/plugins/wiki/www/lib/WikiDB/backend/PDO.php
@@ -129,7 +129,7 @@ class WikiDB_backend_PDO
}
$sth = $this->_dbh->prepare("SELECT version()");
$sth->execute();
- $this->_serverinfo['version'] = $sth->fetchSingle();
+ $this->_serverinfo['version'] = $sth->fetchColumn();
$this->commit(); // required to match the try catch block above!
$prefix = isset($dbparams['prefix']) ? $dbparams['prefix'] : '';
@@ -225,7 +225,7 @@ class WikiDB_backend_PDO
. " AND pagename=?");
$sth->bindParam(1, $pagename, PDO_PARAM_STR, 100);
if ($sth->execute())
- return $sth->fetchSingle();
+ return $sth->fetchColumn();
else
return false;
}
@@ -248,7 +248,7 @@ class WikiDB_backend_PDO
$sth = $dbh->exec("SELECT count(*)"
. " FROM $nonempty_tbl, $page_tbl"
. " WHERE $nonempty_tbl.id=$page_tbl.id");
- return $sth->fetchSingle();
+ return $sth->fetchColumn();
}
function increaseHitCount($pagename)
@@ -342,7 +342,7 @@ class WikiDB_backend_PDO
$sth = $dbh->prepare("SELECT cached_html FROM $page_tbl WHERE
pagename=? LIMIT 1");
$sth->bindParam(1, $pagename, PDO_PARAM_STR, 100);
$sth->execute();
- return $sth->fetchSingle(PDO_FETCH_NUM);
+ return $sth->fetchColumn(PDO_FETCH_NUM);
}
function set_cached_html($pagename, $data)
@@ -377,7 +377,7 @@ class WikiDB_backend_PDO
$page_tbl = $this->_table_names['page_tbl'];
$sth = $dbh->prepare("SELECT id FROM $page_tbl WHERE pagename=? LIMIT
1");
$sth->bindParam(1, $pagename, PDO_PARAM_STR, 100);
- $id = $sth->fetchSingle();
+ $id = $sth->fetchColumn();
if (!$create_if_missing) {
return $id;
}
@@ -395,7 +395,7 @@ class WikiDB_backend_PDO
$this->beginTransaction();
$sth = $dbh->prepare("SELECT MAX(id) FROM $page_tbl");
$sth->execute();
- $id = $sth->fetchSingle();
+ $id = $sth->fetchColumn();
$sth = $dbh->prepare("INSERT INTO $page_tbl"
. " (id,pagename,hits)"
. " VALUES (?,?,0)");
@@ -423,7 +423,7 @@ class WikiDB_backend_PDO
. " LIMIT 1");
$sth->bindParam(1, $pagename, PDO_PARAM_STR, 100);
$sth->execute();
- return $sth->fetchSingle();
+ return $sth->fetchColumn();
}
function get_previous_version($pagename, $version)
@@ -440,7 +440,7 @@ class WikiDB_backend_PDO
$sth->bindParam(1, $pagename, PDO_PARAM_STR, 100);
$sth->bindParam(2, $version, PDO_PARAM_INT);
$sth->execute();
- return $sth->fetchSingle();
+ return $sth->fetchColumn();
}
/**
@@ -674,7 +674,7 @@ class WikiDB_backend_PDO
$this->set_links($pagename, false);
$sth = $dbh->prepare("SELECT COUNT(*) FROM $link_tbl WHERE
linkto=$id");
$sth->execute();
- if ($sth->fetchSingle()) {
+ if ($sth->fetchColumn()) {
// We're still in the link table (dangling link) so we can't
delete this
// altogether.
$dbh->query("UPDATE $page_tbl SET hits=0, pagedata='' WHERE
id=$id");
@@ -732,7 +732,7 @@ class WikiDB_backend_PDO
. " WHERE ISNULL($nonempty_tbl.id) AND"
. " ISNULL($version_tbl.id) AND $page_tbl.id=$id");
$sth1->execute();
- if ($sth1->fetchSingle()) {
+ if ($sth1->fetchColumn()) {
$dbh->query("DELETE FROM $page_tbl WHERE id=$id"); // this
purges the link
$dbh->query("DELETE FROM $recent_tbl WHERE id=$id"); //
may fail
}
@@ -805,7 +805,7 @@ class WikiDB_backend_PDO
$sth->bindParam(1, $pagename, PDO_PARAM_STR, 100);
$sth->bindParam(2, $link, PDO_PARAM_STR, 100);
$sth->execute();
- return $sth->fetchSingle();
+ return $sth->fetchColumn();
}
function get_all_pages($include_empty = false, $sortby = '', $limit = '',
$exclude = '')
diff --git a/src/plugins/wiki/www/lib/WikiUser/PdoDb.php
b/src/plugins/wiki/www/lib/WikiUser/PdoDb.php
index 30a0e36..d3038ce 100644
--- a/src/plugins/wiki/www/lib/WikiUser/PdoDb.php
+++ b/src/plugins/wiki/www/lib/WikiUser/PdoDb.php
@@ -144,7 +144,7 @@ class _PdoDbPassUser
trigger_error("SQL Error: " . $e->getMessage(),
E_USER_WARNING);
return false;
}
- if ($this->_authselect->fetchSingle())
+ if ($this->_authselect->fetchColumn())
return true;
} else {
if (!$dbi->getAuthParam('auth_user_exists'))
@@ -153,7 +153,7 @@ class _PdoDbPassUser
$this->_authcheck =
$dbh->prepare($dbi->getAuthParam('auth_check'));
$this->_authcheck->bindParam("userid", $this->_userid,
PDO_PARAM_STR, 48);
$this->_authcheck->execute();
- if ($this->_authcheck->fetchSingle())
+ if ($this->_authcheck->fetchColumn())
return true;
}
// User does not exist yet.
-----------------------------------------------------------------------
Summary of changes:
src/plugins/wiki/www/lib/DbSession/PDO.php | 2 +-
src/plugins/wiki/www/lib/WikiDB/backend/PDO.php | 22 +++++++++++-----------
src/plugins/wiki/www/lib/WikiUser/PdoDb.php | 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
