Merge branch 'MDL36874_Text_navigation_for_Books' of git://github.com/Dave-B/moodle

Conflicts:
	mod/book/version.php
	mod/book/db/upgrade.php

diff --cc lib/outputlib.php
Simple merge

diff --cc lib/outputrenderers.php
Simple merge

diff --cc mod/book/db/upgrade.php
index 3e17901,e444368..b71e386
--- 1/mod/book/db/upgrade.php
--- 2/mod/book/db/upgrade.php
+++ b/mod/book/db/upgrade.php
@@@ -203,9 -203,19 +203,24 @@@ function xmldb_book_upgrade($oldversion
  
      // Moodle v2.7.0 release upgrade line.
      // Put any upgrade step following this.
 -    if ($oldversion < 2014051201) {
 -        // MDL-36874 Book update.
 +
 +    // Moodle v2.8.0 release upgrade line.
 +    // Put any upgrade step following this.
 +
++    if ($oldversion < 2014111800) {
++
++        // Define field navstyle to be added to book.
+         $table = new xmldb_table('book');
 -        $field = new xmldb_field('navstyle', XMLDB_TYPE_INTEGER, '4' , XMLDB_UNSIGNED, XMLDB_NOTNULL, null, 1);
++        $field = new xmldb_field('navstyle', XMLDB_TYPE_INTEGER, '4', null, XMLDB_NOTNULL, null, '1', 'numbering');
+ 
+         // Conditionally launch add field navstyle.
+         if (!$dbman->field_exists($table, $field)) {
+             $dbman->add_field($table, $field);
+         }
+ 
 -        // MDL-36874 savepoint reached.
 -        upgrade_mod_savepoint(true, 2014051201, 'book');
++        // Book savepoint reached.
++        upgrade_mod_savepoint(true, 2014111800, 'book');
+     }
+ 
      return true;
  }

diff --cc mod/book/version.php
index f5915c4,c5d5c8b..bdfc25c
--- 1/mod/book/version.php
--- 2/mod/book/version.php
+++ b/mod/book/version.php
@@@ -25,6 -25,6 +25,6 @@@
  defined('MOODLE_INTERNAL') || die;
  
  $plugin->component = 'mod_book'; // Full name of the plugin (used for diagnostics)
- $plugin->version   = 2014111000; // The current module version (Date: YYYYMMDDXX)
 -$plugin->version   = 2014051201; // The current module version (Date: YYYYMMDDXX)
 -$plugin->requires  = 2014050800; // Requires this Moodle version
++$plugin->version   = 2014111800; // The current module version (Date: YYYYMMDDXX)
 +$plugin->requires  = 2014110400; // Requires this Moodle version
  $plugin->cron      = 0;          // Period for cron to check this module (secs)