Permalink
Browse files

Merge branch 'MDL-27053-dev-code-warning' of git://github.com/mudrd8m…

…z/moodle
  • Loading branch information...
2 parents 9015609 + a95682b commit fe0ccf0c792c0d241438e19fb10d1cc747402c89 @skodak skodak committed Apr 13, 2011
Showing with 17 additions and 6 deletions.
  1. +12 −0 admin/index.php
  2. +0 −3 index.php
  3. +5 −3 lang/en/admin.php
View
@@ -194,6 +194,7 @@
}
if ($version > $CFG->version) { // upgrade
+ purge_all_caches();
$PAGE->set_pagelayout('maintenance');
$PAGE->set_popup_notification_allowed(false);
@@ -407,6 +408,17 @@
admin_externalpage_setup('adminnotifications');
echo $OUTPUT->header();
+// Unstable code warning
+if (isset($maturity)) {
+ if ($maturity < MATURITY_STABLE) {
+ $maturitylevel = get_string('maturity'.$maturity, 'admin');
+ echo $OUTPUT->box(
+ get_string('maturitycoreinfo', 'admin', $maturitylevel) . ' ' .
+ $OUTPUT->doc_link('admin/versions', get_string('morehelp')),
+ 'generalbox adminwarning maturityinfo');
+ }
+}
+
if ($insecuredataroot == INSECURE_DATAROOT_WARNING) {
echo $OUTPUT->box(get_string('datarootsecuritywarning', 'admin', $CFG->dataroot), 'generalbox adminwarning');
} else if ($insecuredataroot == INSECURE_DATAROOT_ERROR) {
View
@@ -88,9 +88,6 @@
$PAGE->set_heading($SITE->fullname);
echo $OUTPUT->header();
- //TODO: remove this notice once admins know they need to switch CVS and git branches, the reason is once we start changing DB there will not be any way back!
- echo $OUTPUT->box('WARNING: this site is using 2.1dev codebase, please make sure this is is not a production server!!!', 'errorbox');
-
/// Print Section
if ($SITE->numsections > 0) {
View
@@ -684,9 +684,11 @@
$string['maturity100'] = 'Beta';
$string['maturity150'] = 'Release candidate';
$string['maturity200'] = 'Stable version';
-$string['maturitycorewarning'] = 'You are going to install or upgrade Moodle to a version marked as "{$a}"
-that is not considered as production-ready yet. Please make sure this is intentional
-and that you are using correct checkout of Moodle source code.';
+$string['maturitycoreinfo'] = 'Your site is currently running unstable "{$a}" development code.';
+$string['maturitycorewarning'] = 'The version of Moodle that you are about to install or upgrade to contains
+unstable "{$a}" development code that is not suitable for use on most production
+sites. If this is not what you wanted then you should make sure you are updating
+from a STABLE branch of the Moodle code. See Moodle Docs for more details.';
$string['maxbytes'] = 'Maximum uploaded file size';
$string['maxconsecutiveidentchars'] = 'Consecutive identical characters';
$string['maxeditingtime'] = 'Maximum time to edit posts';

0 comments on commit fe0ccf0

Please sign in to comment.