Merge branch 'MDL-33121' of git://github.com/rwijaya/moodle

diff --cc mod/book/locallib.php
index b0a23af,a4c0487..26d0e40
--- 1/mod/book/locallib.php
--- 2/mod/book/locallib.php
+++ b/mod/book/locallib.php
@@@ -268,13 -254,9 +254,13 @@@ function book_get_toc($chapters, $chapt
                      }
                  } else {
                      if ($book->numbering == BOOK_NUM_NUMBERS) {
 -                        $title = "x.x $title";
 +                        if (empty($chapters[$ch->parent]->hidden)) {
 +                            $title = "$nch.x $title";
 +                        } else {
 +                            $title = "x.x $title";
 +                        }
                      }
-                     $title = '<span class="dimmed_text">'.$title.'</span>';
+                     $title = html_writer::tag('span', $title, array('class' => 'dimmed_text'));
                  }
              }
  

diff --cc mod/book/tool/exportimscp/version.php
Simple merge

diff --cc mod/book/tool/importhtml/locallib.php
Simple merge

diff --cc mod/book/tool/importhtml/version.php
Simple merge

diff --cc mod/book/tool/print/version.php
Simple merge

diff --cc mod/book/version.php
Simple merge