I was actually looking to fix a bug about it displaying the currently logged in user in search results, but there's a change on the forums branch that will allow this, and I don't want conflicts.

Also noted in undelete_user what has to be done to undo this change, but I haven't implemented it because there's nowhere in Mahara where undeleting a user is possible in the UI anyhow.

Ensure that when a user is deleted, suspended or has their account expired, they really are unable to log in.

Not sure for how long this has been broken, but it seems that deleted users could browse around the site just fine. They don't show up in search results but you can still view their profile page...

Now the items are layed out in a grid to the right of the searcher, which saves some vertical space and has more fluidity to the layout.

Also, the calendar elements have from/to text, which is a small violation of the language text freeze but makes the purpose of the calendar items for each element much clearer.

I'd like to add more text to this page as an explanation, though that would be a larger violation.

Changed a smarty() call to smarty_core(), using the full object for a form element template is overkill.

The fix basically works by adding a hidden submit button at the very beginning of the form. Its "name" is the same as for whatever current action is being performed. Thus, when enter is pressed, the same value is passed through.

In javascript mode, this form element's name attribute is poked every time a new element is configured to be correct for that. There is also some special event handling for the search tab of the artefact chooser, so it does not trigger a form submit - just a 'click' event on the correct button.

Make sure that errors don't occur if pagination DOM nodes aren't available (similar to previous commit, but for the paginator itself)

Handle the case when there is no pagination related DOM stuff available - as happens when there are no results.

Fixes: If the artefact chooser has no tabs, then every single link on the page will be wired up to attempt to retrieve more data via AJAX for the artefact chooser.

Fixed by checking that there are actually tabs first.

Together with the previous commit, fixes #1720

Together with the next commit, solves #1720

Prevent a fatal error caused by adding the entireresume blocktype then visiting your resume for the first time.

The 'contactinformation' blocktype is attempted to be added to the entireresume blockinstance that has been created, causing badness as the blocktype hasn't actually been committed yet. Move the part of the commit where it's added to the database before the part where it's added to any views.

Also make sure that contact information isn't shown in a view as just a <table></table> if it has no content.

Updated search code for solr 1.2. Now send correct Content-type header, and parse responses the 1.2 way.

Also, store tags as multivalued arrays.

Also put in a check for no results being returned.

Make the tags field 'textTight' to make it a more restrictive match, closer to how the internal tag search now works.

Also made it multivalued.

Fixes bug #1332.

Turns out I got the table_column call wrong also. Needs to, like with everything else in xmldb, fully respecify the column. Now the view migration works in MySQL

XMLDB and MySQL conspired to make this a horrible process.

This change adds the ability to prevent the SQLException constructor from logging errors, which is used in init.php when attempting to load the config data and set default config values.

Removed a couple of unneeded debugging lines from the view migration. Made sure to make the block column of the view_artefact table not null after the upgrade, and clear out all the null rows

Ensure that two different composites of the same type can be displayed in the same view, by suffixing their variables/IDs with something random

Conflicts:

	htdocs/lib/upgrade.php

Make blocks with more than one artefact in them (as what happens with listself) be expanded to have all of them displayed individually. This fixes the last major problem with migrating view templates.