$result2=db_query(db_rewrite_sql("SELECT n.type, n.title, b.*, ml.* FROM {book} b INNER JOIN {node} n on b.nid = n.nid INNER JOIN {menu_links} ml ON b.mlid = ml.mlid WHERE n.nid IN (".implode(',',$nids).") AND n.status = 1 ORDER BY ml.weight, ml.link_title"));
$result2=db_query(db_rewrite_sql("SELECT n.type, n.title, b.*, ml.* FROM {book} b INNER JOIN {node} n on b.nid = n.nid INNER JOIN {menu_links} ml ON b.mlid = ml.mlid WHERE n.nid IN (".implode(',',$nids).") AND n.status = 1 ORDER BY ml.weight, ml.link_title"));
while($link=db_fetch_array($result2)){
while($link=db_fetch_array($result2)){
$link['href']=$link['link_path'];
$link['href']=$link['link_path'];
$link['options']=unserialize($link['options']);
$link['options']=unserialize($link['options']);
...
@@ -404,7 +404,7 @@ function _book_add_form_elements(&$form, $node) {
...
@@ -404,7 +404,7 @@ function _book_add_form_elements(&$form, $node) {
@@ -341,13 +341,13 @@ function comment_new_page_count($num_comments, $new_replies, $nid) {
...
@@ -341,13 +341,13 @@ function comment_new_page_count($num_comments, $new_replies, $nid) {
// Newest first: find the last thread with new comment
// Newest first: find the last thread with new comment
$result=db_query('(SELECT thread FROM {comments} WHERE nid = %d AND status = 0 ORDER BY timestamp DESC LIMIT %d) ORDER BY thread DESC LIMIT 1',$nid,$new_replies);
$result=db_query('(SELECT thread FROM {comments} WHERE nid = %d AND status = 0 ORDER BY timestamp DESC LIMIT %d) ORDER BY thread DESC LIMIT 1',$nid,$new_replies);
$thread=db_result($result);
$thread=db_result($result);
$result_count=db_query("SELECT COUNT(*) FROM {comments} WHERE nid = %d AND status = 0 AND thread > '".$thread."'",$nid);
$result_count=db_query("SELECT COUNT(*) FROM {comments} WHERE nid = %d AND status = 0 AND thread > '".$thread."'",$nid);
}
}
else{
else{
// Oldest first: find the first thread with new comment
// Oldest first: find the first thread with new comment
$result=db_query('(SELECT thread FROM {comments} WHERE nid = %d AND status = 0 ORDER BY timestamp DESC LIMIT %d) ORDER BY SUBSTRING(thread, 1, (LENGTH(thread) - 1)) LIMIT 1',$nid,$new_replies);
$result=db_query('(SELECT thread FROM {comments} WHERE nid = %d AND status = 0 ORDER BY timestamp DESC LIMIT %d) ORDER BY SUBSTRING(thread, 1, (LENGTH(thread) - 1)) LIMIT 1',$nid,$new_replies);
$thread=substr(db_result($result),0,-1);
$thread=substr(db_result($result),0,-1);
$result_count=db_query("SELECT COUNT(*) FROM {comments} WHERE nid = %d AND status = 0 AND SUBSTRING(thread, 1, (LENGTH(thread) - 1)) < '".$thread."'",$nid);
$result_count=db_query("SELECT COUNT(*) FROM {comments} WHERE nid = %d AND status = 0 AND SUBSTRING(thread, 1, (LENGTH(thread) - 1)) < '".$thread."'",$nid);
@@ -46,7 +46,7 @@ function locale_help($path, $arg) {
...
@@ -46,7 +46,7 @@ function locale_help($path, $arg) {
return'<p>'.t('The language used to display a web page is determined with a negotiation algorithm. You can choose how this algorithm should work. By default, there is no negotiation and the default language is used. You can use path prefixes (like "de" and "it" for German and Italian content) with different fallback options, so you can have web addresses like /de/contact and /it/contact. Alternatively you can use custom domains like de.example.com and it.example.com. Customize path prefixes and set domain names on the <a href="@languages">language editing pages</a>.',array('@languages'=>url('admin/settings/language'))).'</p>';
return'<p>'.t('The language used to display a web page is determined with a negotiation algorithm. You can choose how this algorithm should work. By default, there is no negotiation and the default language is used. You can use path prefixes (like "de" and "it" for German and Italian content) with different fallback options, so you can have web addresses like /de/contact and /it/contact. Alternatively you can use custom domains like de.example.com and it.example.com. Customize path prefixes and set domain names on the <a href="@languages">language editing pages</a>.',array('@languages'=>url('admin/settings/language'))).'</p>';
case'admin/build/translate':
case'admin/build/translate':
return'<p>'.t("This page provides an overview of interface translation on the site. Drupal groups all translatable strings in so called 'text groups'. Text groups are useful, because you can focus your translation efforts on the groups of text you care most about. For example, a translation team could choose not to fully translate the text group that includes all the long help texts on the administration pages. Similarly, text groups are useful to ensure that certain aspects of the site are always fully translated.").'</p>';
return'<p>'.t("This page provides an overview of interface translation on the site. Drupal groups all translatable strings in so called 'text groups'. Text groups are useful, because you can focus your translation efforts on the groups of text you care most about. For example, a translation team could choose not to fully translate the text group that includes all the long help texts on the administration pages. Similarly, text groups are useful to ensure that certain aspects of the site are always fully translated.").'</p>';
case'admin/build/translate/import':
case'admin/build/translate/import':
return'<p>'.t("This page allows you to import a translation provided in the gettext Portable Object (.po) format. The easiest way to get your site translated is to obtain an existing Drupal translation and to import it. You can find existing translations on the <a href=\"@url\">Drupal translation page</a>. Note that importing a translation file might take a while.",array('@url'=>'http://drupal.org/project/translations')).'</p>';
return'<p>'.t("This page allows you to import a translation provided in the gettext Portable Object (.po) format. The easiest way to get your site translated is to obtain an existing Drupal translation and to import it. You can find existing translations on the <a href=\"@url\">Drupal translation page</a>. Note that importing a translation file might take a while.",array('@url'=>'http://drupal.org/project/translations')).'</p>';
case'admin/build/translate/export':
case'admin/build/translate/export':
...
@@ -256,7 +256,7 @@ function locale_form_alter(&$form, $form_state, $form_id) {
...
@@ -256,7 +256,7 @@ function locale_form_alter(&$form, $form_state, $form_id) {