--- last_node.module Mon Jun 30 16:45:10 2008
+++ last_node.module Tue Feb 17 12:22:29 2009
@@ -95,11 +95,14 @@
*
*/
function _last_node_contents($which_block = '0') {
+ global $language;
+ $lang = $language->language;
+
if ($which_block == '0') {
$node = array_keys(array_filter(variable_get('last_node_check',array())));
if (!empty($node)) {
$placeholders = implode(',', array_fill(0, count($node), "'%s'"));
- $result = db_query_range(db_rewrite_sql("SELECT n.nid, n.title FROM {node} n WHERE n.type in ($placeholders) AND n.status = 1 ORDER BY n.created DESC"), $node, 0, 10);
+ $result = db_query_range(db_rewrite_sql("SELECT n.nid, n.title FROM {node} n WHERE n.type in ($placeholders) AND n.language = '%s' AND n.status = 1 ORDER BY n.created DESC"), $node, $lang, 0, 10);
while ($node = db_fetch_object($result)) {
$output .= l($node->title,'node/'. $node->nid) ."
-
";
}
@@ -130,7 +133,7 @@
$node = variable_get('last_node_check',array());
if (!empty($node)) {
$placeholders = implode(',', array_fill(0, count($node), "'%s'"));
- $result = db_query_range(db_rewrite_sql("SELECT n.nid, n.title, n.sticky FROM {node} n WHERE n.type in ($placeholders) AND n.status = 1 AND n.sticky = 1 ORDER BY n.created DESC"), $node, 0, 10);
+ $result = db_query_range(db_rewrite_sql("SELECT n.nid, n.title, n.sticky FROM {node} n WHERE n.type in ($placeholders) AND n.language = '%s' AND n.status = 1 AND n.sticky = 1 ORDER BY n.created DESC"), $node, $lang, 0, 10);
while ($node = db_fetch_object($result)) {
$output .= l($node->title,'node/'. $node->nid) ."
-
";
}
@@ -140,7 +143,7 @@
return $output;
}
if (_last_node_validnode($which_block)) {
- $result = db_query_range("SELECT n.title, n.nid FROM {node} n WHERE n.status = 1 AND n.type = '%s' ORDER BY n.created DESC", $which_block, 0, 10);
+ $result = db_query_range("SELECT n.title, n.nid FROM {node} n WHERE n.status = 1 AND n.type = '%s' AND n.language = '%s' ORDER BY n.created DESC", $which_block, $lang, 0, 10);
while ($node = db_fetch_object($result)) {
$output[] = l($node->title,'node/'. $node->nid);
}
@@ -160,9 +163,11 @@
function lastnode_display($title="", $node_type="", $numitem = 5, $alt_text="") {
$lista = array();
$args = array();
+ global $language;
+ $lang = $language->language;
drupal_add_css(drupal_get_path("module","last_node") ."/last_node.css");
- $result = db_query_range("SELECT n.title, n.nid, n.created FROM {node} n WHERE n.status = 1 AND n.type = '%s' ORDER BY n.created DESC", $node_type, 0, $numitem);
+ $result = db_query_range("SELECT n.title, n.nid, n.created FROM {node} n WHERE n.status = 1 AND n.type = '%s' AND n.language = '%s' ORDER BY n.created DESC", $node_type, $lang, 0, $numitem);
while ($node = db_fetch_object($result)) {
$lista[] = l($node->title ." (". format_date($node->created,'small') .")",'node/'. $node->nid);
@@ -263,7 +268,10 @@
drupal_not_found();
return;
}
- $result = db_query_range("SELECT n.nid, n.title, n.created, u.name, u.uid FROM {node} n INNER JOIN {users} u ON n.uid = u.uid WHERE n.type = '%s' AND n.status = 1 ORDER BY n.created DESC", $type, 0, 10);
+ global $language;
+
+ $lang = $language->language;
+ $result = db_query_range("SELECT n.nid, n.title, n.created, u.name, u.uid FROM {node} n INNER JOIN {users} u ON n.uid = u.uid WHERE n.type = '%s' AND n.language = '%s' AND n.status = 1 ORDER BY n.created DESC", $type, $lang, 0, 10);
$channel['title'] = variable_get('site_name', 'drupal') ." ". variable_get('last_node_labelnode_'. $type, $type);
$channel['link'] = url('last_node/'.$type);
$channel['description'] = variable_get('site_name', 'drupal') ." Sezione ". variable_get('last_node_labelnode_'. $type, $type);
@@ -310,7 +318,10 @@
drupal_set_title(_last_node_normalize_title(drupal_get_title(), $type));
- $result = pager_query(db_rewrite_sql("SELECT n.nid, n.created FROM {node} n WHERE n.type = '%s' AND n.status = 1 ORDER BY n.created DESC"), variable_get('default_nodes_main', 10), 0, NULL, $type);
+ global $language;
+
+ $lang = $language->language;
+ $result = pager_query(db_rewrite_sql("SELECT n.nid, n.created FROM {node} n WHERE n.type = '%s' AND n.language = '%s' AND n.status = 1 ORDER BY n.created DESC"), variable_get('default_nodes_main', 10), 0, NULL, $type, $lang);
while ($node = db_fetch_object($result)) {
$output .= node_view(node_load($node->nid), 1);