Commit 0d988eb4 authored by sun's avatar sun

#247420 and #217015 by smk-ka, webchick: Fixed SQL error when using empty text as argument default.

parent a2598cb3
......@@ -2,6 +2,8 @@ CHANGELOG for Views for Drupal 5
Views 5.x-1.x
Bugs fixed:
o #247420 and #217015 by smk-ka, webchick: Fixed SQL error when using empty
text as argument default.
o #191420 by sun: Fixed missing t() for view import page title.
o #166608: missing ->status setting caused access control on various node
links to fail.
......
......@@ -564,10 +564,10 @@ function views_build_view($type, &$view, $args = array(), $use_pager = false, $l
return $info;
}
$query = db_rewrite_sql($info['query'], 'node');
$items = array();
if ($query) {
if ($info['query']) {
$query = db_rewrite_sql($info['query'], 'node');
if ($view->use_pager) {
$cquery = db_rewrite_sql($info['countquery'], 'node', 'nid', $info['rewrite_args']);
$result = pager_query($query, $view->pager_limit, $view->use_pager - 1, $cquery, $info['args']);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment