moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 02:46:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'wip-mdl-44873-m26' of git://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE

Browse source
This commit is contained in:
Marina Glancy 2014-04-07 16:16:47 +08:00
commit fce220eb97
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/tests/behat/behat_hooks.php
View file

@ -477,7 +477,11 @@ class behat_hooks extends behat_base {
if ($errormsg = $this->getSession()->getPage()->find('xpath', $exceptionsxpath)) { if ($errormsg = $this->getSession()->getPage()->find('xpath', $exceptionsxpath)) {
// Getting the debugging info and the backtrace. // Getting the debugging info and the backtrace.
$errorinfoboxes = $this->getSession()->getPage()->findAll('css', 'div.notifytiny'); $errorinfoboxes = $this->getSession()->getPage()->findAll('css', 'div.alert-error');
// If errorinfoboxes is empty, try find notifytiny (original) class.
if (empty($errorinfoboxes)) {
$errorinfoboxes = $this->getSession()->getPage()->findAll('css', 'div.notifytiny');
}
$errorinfo = $this->get_debug_text($errorinfoboxes[0]->getHtml()) . "\n" . $errorinfo = $this->get_debug_text($errorinfoboxes[0]->getHtml()) . "\n" .
$this->get_debug_text($errorinfoboxes[1]->getHtml()); $this->get_debug_text($errorinfoboxes[1]->getHtml());

2
theme/bootstrapbase/renderers/core_renderer.php
View file

@ -35,7 +35,7 @@ class theme_bootstrapbase_core_renderer extends core_renderer {
$message = clean_text($message); $message = clean_text($message);
$type = ''; $type = '';
if ($classes == 'notifyproblem') { if (($classes == 'notifyproblem') || ($classes == 'notifytiny')) {
$type = 'alert alert-error'; $type = 'alert alert-error';
} }
if ($classes == 'notifysuccess') { if ($classes == 'notifysuccess') {