Index: view.inc =================================================================== --- view.inc (revision 648) +++ view.inc (working copy) @@ -726,7 +726,7 @@ // query; we've already been doing most of what it does, and we // just need to do a little more playing with globals. if (!empty($this->pager['use_pager']) || !empty($this->get_total_rows)) { - $this->total_rows = db_result(db_query($count_query, $args)) - $this->pager['offset']; + $this->total_rows = db_result(db_query_slave($count_query, $args)) - $this->pager['offset']; } if (!empty($this->pager['use_pager'])) { @@ -752,11 +752,11 @@ } $offset = $this->pager['current_page'] * $this->pager['items_per_page'] + $this->pager['offset']; - $result = db_query_range($query, $args, $offset, $this->pager['items_per_page']); + $result = db_query_range_slave($query, $args, $offset, $this->pager['items_per_page']); } else { - $result = db_query($query, $args); + $result = db_query_slave($query, $args); } $this->result = array(); @@ -1244,7 +1244,7 @@ // We want a NULL value to return TRUE here, so we can't use isset() or empty(). if (!array_key_exists($arg, $cache) || $reset) { $where = (is_numeric($arg) ? "vid = %d" : "name = '%s'"); - $data = db_fetch_object(db_query("SELECT * FROM {views_view} WHERE $where", $arg)); + $data = db_fetch_object(db_query_slave("SELECT * FROM {views_view} WHERE $where", $arg)); if (empty($data)) { $cache[$arg] = NULL; } @@ -1255,7 +1255,7 @@ // Load all of our subtables. foreach ($view->db_objects() as $key) { $object_name = "views_$key"; - $result = db_query("SELECT * FROM {{$object_name}} WHERE vid = %d ORDER BY position", $view->vid); + $result = db_query_slave("SELECT * FROM {{$object_name}} WHERE vid = %d ORDER BY position", $view->vid); while ($data = db_fetch_object($result)) { $object = new $object_name(FALSE); @@ -1292,7 +1292,7 @@ * much faster. */ function load_views() { - $result = db_query("SELECT DISTINCT v.* FROM {views_view} v"); + $result = db_query_slave("SELECT DISTINCT v.* FROM {views_view} v"); $views = array(); $vids = array(); @@ -1315,7 +1315,7 @@ // Now load all the subtables: foreach (view::db_objects() as $key) { $object_name = "views_$key"; - $result = db_query("SELECT * FROM {{$object_name}} WHERE vid IN ($vids) ORDER BY vid, position"); + $result = db_query_slave("SELECT * FROM {{$object_name}} WHERE vid IN ($vids) ORDER BY vid, position"); while ($data = db_fetch_object($result)) { $object = new $object_name(FALSE);