projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Old hooks superseded by new hooks API.
[fa-stable.git]
/
includes
/
db_pager.inc
diff --git
a/includes/db_pager.inc
b/includes/db_pager.inc
index cf67659a004203b8407815eac60760c47acb2b79..64a79eda8e633cd4316147599bc1be0062fa0346 100644
(file)
--- a/
includes/db_pager.inc
+++ b/
includes/db_pager.inc
@@
-61,7
+61,6
@@
class db_pager {
// $name is base name for pager controls
function db_pager($sql, $name, $table = null, $page_len=0)
{
// $name is base name for pager controls
function db_pager($sql, $name, $table = null, $page_len=0)
{
- global $table_style;
$this->width = "95%";
if ($page_len == 0) $page_len = user_query_size();
$this->name = $name;
$this->width = "95%";
if ($page_len == 0) $page_len = user_query_size();
$this->name = $name;
@@
-160,11
+159,11
@@
class db_pager {
$c = 0;
// add result field names to column defs for
// col value retrieve and sort purposes
$c = 0;
// add result field names to column defs for
// col value retrieve and sort purposes
- $cnt = min(
mysql
_num_fields($result), count($this->columns));
+ $cnt = min(
db
_num_fields($result), count($this->columns));
for ($c = $i = 0; $c < $cnt; $c++) {
if (!(isset($this->columns[$c]['insert']) && $this->columns[$c]['insert'])) {
// if (!@($this->columns[$c]['type']=='skip'))
for ($c = $i = 0; $c < $cnt; $c++) {
if (!(isset($this->columns[$c]['insert']) && $this->columns[$c]['insert'])) {
// if (!@($this->columns[$c]['type']=='skip'))
- $this->columns[$c]['name']=
mysql
_field_name($result, $i);
+ $this->columns[$c]['name']=
db
_field_name($result, $i);
if (!@($this->columns[$c]['type']=='insert'))
$i++;
}
if (!@($this->columns[$c]['type']=='insert'))
$i++;
}
@@
-261,7
+260,7
@@
class db_pager {
if(count($this->extra_where)) {
$where .= ($where=='' ? '' : ' AND ')
if(count($this->extra_where)) {
$where .= ($where=='' ? '' : ' AND ')
- .implode(
$this->extra_where, ' AND '
);
+ .implode(
' AND ', $this->extra_where
);
}
if ($where) $where = " WHERE ($where)";
}
if ($where) $where = " WHERE ($where)";