Wikka 1.1.6.3
Wikka 1.1.6.4
Wikka 1.1.6.5
Wikka 1.1.6.6
Wikka 1.1.6.7
Merge tag 'wikka-1.1.6.3'

Conflicts:
	3rdparty/plugins/geshi/geshi.php
		geshi fixed some indentation
	3rdparty/plugins/geshi/geshi/freebasic.php
	actions/files.php
		changes to file uploading code which FB moved into Wakka
		class
	handlers/page/edit.php
		wikka fixed a typo: omited -> omitted
	handlers/page/files.xml.php
		Wikka replaced _REQUEST with _GET,
		and '/' with DIRECTORY_SEPARATOR
	handlers/page/show.php
		<wiki-error> tags
	libs/Wakka.class.php
		<wiki-error> tags
	wikka.php
		formatting/commentary updates
Merge tag 'wikka-1.1.6.4'

Conflicts:
	3rdparty/plugins/geshi/geshi/freebasic.php
	3rdparty/plugins/wikiedit/protoedit.js
	3rdparty/plugins/wikiedit/wikiedit2.js
		The wikiedit plugin was deleted, and replaced with
		the wikkaedit plugin. FB modified the checkKey() function
		in the old one, but the new one doesn't have it anymore.
		checkKey() was used with stopPropagation() and
		preventDefault(), the new plugin handles this differently.
		I don't know whether anything needs to be adjusted now,
		we must test and see whether everything works the way we
		want it to.
	actions/files.php
		-        if ($file != '.' && $file != '..') {
		+        if (!preg_match('/^\\./', $file)) {
		FB moved this into libs/Wakka.class.php, applied to
		corresponding code there.
	actions/footer.php
		is now templates/footer.php
	actions/usersettings.php
		adjustments to user registration input validation code
		(FB added a check for accept_new_users config var there)
	formatters/wakka.php
		FB had reformatted this, hence the conflict, but no
		functionality changes
	handlers/page/acls.php
		<wiki-error> tag
	handlers/page/edit.php
		ditto
	handlers/page/files.xml.php
		Wikka added check to prevent downloading of files starting
		with '.'
	handlers/page/show.php
		changes right above "show_attached_files" check added by FB
	libs/Wakka.class.php
		1. massive changes to Wakka.FormOpen()
		   FB added "enctype" parameter to the old one, to pass in
		   'multipart/form-data' from Wakka.ShowAttachedFiles(),
		   the new Wakka.FormOpen() now has a boolean "file"
		   parameter that will add this enctype if set to TRUE,
		   so the FB modifications are probably not needed anymore.
		2. <wiki-error> tags again; some had to be removed because
		   <em> tags were removed too
Merge tag 'wikka-1.1.6.5'
Merge tag 'wikka-1.1.6.6'

Conflicts:
	actions/files.php
		-// if ($_REQUEST['action'] == 'upload' AND $uploaded['size'] > 0) {
		-if ($_POST['action'] == 'upload') {
		+if (isset($_POST['action']) && $_POST['action'] == 'upload')
		FB moved this into libs/Wakka.class.php, corresponding
		code updated
	actions/image.php
		FB added check for '/images' and "upload_path"
	handlers/page/files.xml.php
		Wikka added "Cache-control: must-revalidate"
	handlers/page/show.php
		again changes above FB's "show_attached_files" check
	libs/Wakka.class.php
		Wikka now runs Method() before Header(), but shouldn't be
		needed (?), not trivial to do the same since FB added the
		CheckUploadedFiles() call in between Header() and Method().
	templates/footer.php
Merge tag 'wikka-1.1.6.7'