Merge branch '48026-28' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Nov 2014 23:33:46 +0000 (00:33 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Nov 2014 23:33:46 +0000 (00:33 +0100)
1  2 
lib/outputrenderers.php

diff --combined lib/outputrenderers.php
@@@ -3044,6 -3044,7 +3044,7 @@@ EOD
              $returnstr
          );
          $am->set_alignment(action_menu::TR, action_menu::BR);
+         $am->set_nowrap_on_items();
          if ($withlinks) {
              $navitemcount = count($opts->navitems);
              $idx = 0;
@@@ -3718,12 -3719,6 +3719,12 @@@ class core_renderer_cli extends core_re
          }
          return "!! $message !!\n";
      }
 +
 +    /**
 +     * There is no footer for a cli request, however we must override the
 +     * footer method to prevent the default footer.
 +     */
 +    public function footer() {}
  }