Merge with git+ssh://locke.catalyst.net.nz/var/git/mahara.git

htdocs/lib/errors.php

@@ -293,7 +293,7 @@ function log_build_backtrace($backtrace) {
     foreach ($calls as $call) {
         $textmessage .= "  * {$call['class']}{$call['type']}{$call['func']}({$call['args']}) at {$call['file']}:{$call['line']}\n";
         $htmlmessage .= '<li><span style="color:#933;">' . htmlspecialchars($call['class'], ENT_COMPAT, 'UTF-8') . '</span><span style="color:#060;">'
-            . htmlspecialchars($call['type'], ENT_COMPAT, 'UTF-8') . '</span><span style="color:#933;">' . htmlspecialchars($call['func'], ENT_COMPAT, 'UTF-8')
+            . htmlspecialchars($call['type'], ENT_COMPAT, 'UTF-8') . '</span><span style="color:#339;">' . htmlspecialchars($call['func'], ENT_COMPAT, 'UTF-8')
             . '</span><span style="color:#060;">(</span><span style="color:#f00;">' . htmlspecialchars($call['args'], ENT_COMPAT, 'UTF-8') . '</span><span style="color:#060;">)</span> at <strong>' . htmlspecialchars($call['file'], ENT_COMPAT, 'UTF-8') . ':' . $call['line'] . '</strong></li>';
     }
     $htmlmessage .= "</pre>\n";

htdocs/lib/upgrade.php

@@ -154,6 +154,12 @@ function check_upgrades($name=null) {
             $toupgrade[$pluginkey] = $plugininfo;
         }
         else if ($config->version > $pluginversion) {
+            if (isset($config->minupgradefrom) && isset($config->minupgraderelease)
+                && $pluginversion < $config->minupgradefrom) {
+                throw new SanityException("Must upgrade to $config->minupgradefrom "
+                                          . " ($config->minupgraderelease) first "
+                                          . " (you have $pluginversion ($pluginrelease))");
+            }
             if (isset($config->minupgradefrom) && isset($config->minupgraderelease)
                 && $pluginversion < $config->minupgradefrom) {
                 throw new ConfigSanityException("Must upgrade to $config->minupgradefrom "

htdocs/view/create4.php

@@ -60,7 +60,7 @@ function createview4_submit($values) {
 
 
     if (param_boolean('back')) {
-        $data['accesslist'] = array_values($values['accesslist']);
+        $data['accesslist'] = array_values((array)$values['accesslist']);
         log_debug($data);
         $SESSION->set('create_' . $createid, $data);
         redirect(get_config('wwwroot') . 'view/create3.php?createid=' . $createid);

test/bootstrap.pl

@@ -61,11 +61,11 @@ my $m = WWW::Mechanize->new( autocheck => 1 );
 
 # Check for a mahara install page, and run it if we find it
 $m->get($CFG->{url});
-croak 'This doesn\'t look like a mahara install page!' unless $m->content =~ m{admin/upgrade\.php">Agree</a>};
+croak 'This doesn\'t look like a mahara install page!' unless $m->content =~ m{admin/upgrade\.php" method};
 
 # Agree to license
 debug("Agreeing to license...");
-$m->follow_link( text_regex => qr/Agree/ );
+$m->submit_form( form_number => 1 );
 
 # At this point, need to parse page to get scripts to hit to install stuff
 $_ = $m->content;