diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-07-28 19:18:08 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-07-28 19:18:08 +0000 |
| commit | a938e18a1bd36d887010863817470b690fdbf6f3 (patch) | |
| tree | adbc7edb165255a47739fdbe7e0184c241f6340c /includes | |
| parent | ff8b0618f5892d165720453efcd318b0d85a6f8c (diff) | |
| download | brdo-a938e18a1bd36d887010863817470b690fdbf6f3.tar.gz brdo-a938e18a1bd36d887010863817470b690fdbf6f3.tar.bz2 | |
- Patch #491556 by Berdir: completed converting core to DBTNG. Oh my. Kudos to Berdir for this humongous effort.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/install.inc | 1 | ||||
| -rw-r--r-- | includes/pager.inc | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/includes/install.inc b/includes/install.inc index 14999d2c9..f145f4ec8 100644 --- a/includes/install.inc +++ b/includes/install.inc @@ -677,7 +677,6 @@ function drupal_uninstall_modules($module_list = array()) { } $paths[$index] = implode('/', $parts); } - $placeholders = implode(', ', array_fill(0, count($paths), "'%s'")); $result = db_select('menu_links') ->fields('menu_links') diff --git a/includes/pager.inc b/includes/pager.inc index c76a416a8..aba3db575 100644 --- a/includes/pager.inc +++ b/includes/pager.inc @@ -217,7 +217,7 @@ function pager_query($query, $limit = 10, $element = 0, $count_query = NULL) { $pager_page_array = explode(',', $page); // We calculate the total of pages as ceil(items / limit). - $pager_total_items[$element] = db_result(db_query($count_query, $args)); + $pager_total_items[$element] = db_query($count_query, $args)->fetchField(); $pager_total[$element] = ceil($pager_total_items[$element] / $limit); $pager_page_array[$element] = max(0, min((int)$pager_page_array[$element], ((int)$pager_total[$element]) - 1)); return db_query_range($query, $args, $pager_page_array[$element] * $limit, $limit); |