2 merge requests!7452Issue #1797438. HTML5 validation is preventing form submit and not fully...,!789Issue #3210310: Adjust Database API to remove deprecated Drupal 9 code in Drupal 10
@@ -361,7 +361,7 @@ function book_outline_submit($form_id, $form_values) {
...
@@ -361,7 +361,7 @@ function book_outline_submit($form_id, $form_values) {
*/
*/
functionbook_location($node,$nodes=array()){
functionbook_location($node,$nodes=array()){
$parent=db_fetch_object(db_query(db_rewrite_sql('SELECT n.nid, n.title, b.parent, b.weight FROM {node} n INNER JOIN {book} b ON n.vid = b.vid WHERE n.nid = %d'),$node->parent));
$parent=db_fetch_object(db_query(db_rewrite_sql('SELECT n.nid, n.title, b.parent, b.weight FROM {node} n INNER JOIN {book} b ON n.vid = b.vid WHERE n.nid = %d'),$node->parent));
if($parent->title){
if(isset($parent->title)){
$nodes=book_location($parent,$nodes);
$nodes=book_location($parent,$nodes);
$nodes[]=$parent;
$nodes[]=$parent;
}
}
...
@@ -499,6 +499,7 @@ function book_nodeapi(&$node, $op, $teaser, $page) {
...
@@ -499,6 +499,7 @@ function book_nodeapi(&$node, $op, $teaser, $page) {
*/
*/
functiontheme_book_navigation($node){
functiontheme_book_navigation($node){
$output='';
$output='';
$links='';
if($node->nid){
if($node->nid){
$tree=book_tree($node->nid);
$tree=book_tree($node->nid);
...
@@ -575,8 +576,9 @@ function book_toc($exclude = 0) {
...
@@ -575,8 +576,9 @@ function book_toc($exclude = 0) {
$result=db_query(db_rewrite_sql('SELECT n.nid, n.title, b.parent, b.weight FROM {node} n INNER JOIN {book} b ON n.vid = b.vid WHERE n.status = 1 AND n.moderate = 0 ORDER BY b.weight, n.title'));
$result=db_query(db_rewrite_sql('SELECT n.nid, n.title, b.parent, b.weight FROM {node} n INNER JOIN {book} b ON n.vid = b.vid WHERE n.status = 1 AND n.moderate = 0 ORDER BY b.weight, n.title'));
@@ -361,7 +361,7 @@ function book_outline_submit($form_id, $form_values) {
...
@@ -361,7 +361,7 @@ function book_outline_submit($form_id, $form_values) {
*/
*/
functionbook_location($node,$nodes=array()){
functionbook_location($node,$nodes=array()){
$parent=db_fetch_object(db_query(db_rewrite_sql('SELECT n.nid, n.title, b.parent, b.weight FROM {node} n INNER JOIN {book} b ON n.vid = b.vid WHERE n.nid = %d'),$node->parent));
$parent=db_fetch_object(db_query(db_rewrite_sql('SELECT n.nid, n.title, b.parent, b.weight FROM {node} n INNER JOIN {book} b ON n.vid = b.vid WHERE n.nid = %d'),$node->parent));
if($parent->title){
if(isset($parent->title)){
$nodes=book_location($parent,$nodes);
$nodes=book_location($parent,$nodes);
$nodes[]=$parent;
$nodes[]=$parent;
}
}
...
@@ -499,6 +499,7 @@ function book_nodeapi(&$node, $op, $teaser, $page) {
...
@@ -499,6 +499,7 @@ function book_nodeapi(&$node, $op, $teaser, $page) {
*/
*/
functiontheme_book_navigation($node){
functiontheme_book_navigation($node){
$output='';
$output='';
$links='';
if($node->nid){
if($node->nid){
$tree=book_tree($node->nid);
$tree=book_tree($node->nid);
...
@@ -575,8 +576,9 @@ function book_toc($exclude = 0) {
...
@@ -575,8 +576,9 @@ function book_toc($exclude = 0) {
$result=db_query(db_rewrite_sql('SELECT n.nid, n.title, b.parent, b.weight FROM {node} n INNER JOIN {book} b ON n.vid = b.vid WHERE n.status = 1 AND n.moderate = 0 ORDER BY b.weight, n.title'));
$result=db_query(db_rewrite_sql('SELECT n.nid, n.title, b.parent, b.weight FROM {node} n INNER JOIN {book} b ON n.vid = b.vid WHERE n.status = 1 AND n.moderate = 0 ORDER BY b.weight, n.title'));