Permalink
Browse files

Merge remote-tracking branch 'skodak/w03_MDL-31109_m22_maintenance' i…

…nto MOODLE_22_STABLE
  • Loading branch information...
2 parents 1480ead + 04c0a7d commit ac0d9c6411cbcce5075d41124082a23107e56597 Sam Hemelryk committed Jan 16, 2012
Showing with 4 additions and 2 deletions.
  1. +4 −2 admin/renderer.php
View
6 admin/renderer.php
@@ -339,8 +339,10 @@ public function maintenance_mode_warning($maintenancemode) {
return '';
}
- return $this->warning(get_string('sitemaintenancewarning2', 'admin',
- new moodle_url('/admin/settings.php', array('section' => 'maintenancemode'))));
+ $url = new moodle_url('/admin/settings.php', array('section' => 'maintenancemode'));
+ $url = $url->out(); // get_string() does not support objects in params
+
+ return $this->warning(get_string('sitemaintenancewarning2', 'admin', $url));
}
/**

0 comments on commit ac0d9c6

Please sign in to comment.