Merge branch 'master' of git+ssh://git.catalyst.net.nz/git/public/mahara

htdocs/auth/lib.php

@@ -1197,14 +1197,6 @@ function password_validate(Pieform $form, $values, User $user) {
         $form->set_error('password2', get_string('passwordsdonotmatch'));
     }
 
-    // No Mike, that's a _BAD_ Mike! :)
-    if (substr($values['password1'], 0, 6) == 'mike01') {
-        if (!$form->get_property('jsform')) {
-            die_info('<img src="'
-                . theme_get_url('images/sidebox1_corner_botright.gif')
-                . '" alt="(C) 2007 MSS Enterprises"></p>');
-        }
-    }
 }
 
 class PluginAuth extends Plugin {

htdocs/js/paginator.js

@@ -45,8 +45,19 @@ var Paginator = function(id, datatable, script, extradata) {
             sendjsonrequest(self.jsonScript, queryData, 'GET', function(data) {
                 var tbody = getFirstElementByTagAndClassName('tbody', null, self.datatable);
                 if (tbody) {
+                    if (
+                        (document.all && document.documentElement && typeof(document.documentElement.style.maxHeight) != "undefined" && !window.opera)
+                        ||
+                        (/Konqueror|AppleWebKit|KHTML/.test(navigator.userAgent))) {
+                        var temp = $('ie-workaround');
+                        temp.innerHTML = '<table><tbody>' + data['data']['tablerows'];
+                        swapDOM(tbody, temp.childNodes[0].childNodes[0]);
+                        replaceChildNodes(temp);
+                    }
+                    else {
                         tbody.innerHTML = data['data']['tablerows'];
                     }
+                }
 
                 // Update the pagination
                 if ($(self.id)) {

htdocs/lib/form/elements/artefactchooser.php

@@ -204,8 +204,25 @@ if (ul) {
                 sendjsonrequest(p.jsonScript, queryData, 'GET', function(data) {
                     var tbody = getFirstElementByTagAndClassName('tbody', null, p.datatable);
                     if (tbody) {
+                    //    var temp = DIV();
+                    //    temp.innerHTML = data['data']['tablerows'];
+                    //    swapDOM(tbody, temp);
+                        if (
+                            (document.all && document.documentElement && typeof(document.documentElement.style.maxHeight) != "undefined" && !window.opera)
+                            ||
+                            (/Konqueror|AppleWebKit|KHTML/.test(navigator.userAgent))) {
+                            var temp = $('ie-workaround');
+                            temp.innerHTML = '<table><tbody>' + data['data']['tablerows'];
+                            swapDOM(tbody, temp.childNodes[0].childNodes[0]);
+                            replaceChildNodes(temp);
+                        }
+                        else {
+                            // This does not work in IE and Konqueror, the tbody 
+                            // innerHTML property is readonly.
+                            // http://www.ericvasilik.com/2006/07/code-karma.html
                             tbody.innerHTML = data['data']['tablerows'];
                         }
+                    }
 
                     // Update the pagination
                     if ($(p.id)) {

htdocs/register.php

@@ -148,6 +148,14 @@ if (isset($key)) {
         // Log the user in and send them to the homepage
         $USER = new LiveUser();
         $USER->reanimate($user->id, $authinstance->id);
+
+        // A special greeting for special people
+        if (in_array($user->username, array('waawaamilk', 'Mjollnir`', 'Ned', 'richardm', 'fmarier'))) {
+            $SESSION->add_ok_msg('MAMA!!! Maharababy happy to see you :D :D!');
+        }
+        else if ($user->username == 'htaccess') {
+            $SESSION->add_ok_msg('Welcome B-Quack, htaccess!');
+        }
         redirect();
     }
 

htdocs/theme/default/templates/form/artefactchooser.tpl

@@ -19,5 +19,6 @@
         {else}
         <p class="noartefacts">{str tag=noartefactstochoosefrom section=view}</p>
         {/if}
+        <div style="visibility: hidden;" id="ie-workaround"></div>
     </div>
 </div>