Merge branch 'lorea-preprod'

22 files changed, 185 insertions, 134 deletions

diff --git a/engine/classes/ElggPluginManifest.php b/engine/classes/ElggPluginManifest.php
index 7aa702d47..7e79c15c8 100644
--- a/engine/classes/ElggPluginManifest.php
+++ b/engine/classes/ElggPluginManifest.php
@@ -319,12 +319,26 @@ class ElggPluginManifest {
 	 * @return array
 	 */
 	public function getCategories() {
+		$bundled_plugins = array('blog', 'bookmarks', 'categories',
+			'custom_index', 'dashboard', 'developers', 'diagnostics',
+			'embed', 'externalpages', 'file', 'garbagecollector',
+			'groups', 'htmlawed', 'invitefriends', 'likes',
+			'logbrowser', 'logrotate', 'members', 'messageboard',
+			'messages', 'notifications', 'oauth_api', 'pages', 'profile',
+			'reportedcontent', 'search', 'tagcloud', 'thewire', 'tinymce',
+			'twitter', 'twitter_api', 'uservalidationbyemail', 'zaudio',
+		);
+
 		$cats = $this->parser->getAttribute('category');
 
 		if (!$cats) {
 			$cats = array();
 		}
 
+		if (in_array('bundled', $cats) && !in_array($this->getPluginID(), $bundled_plugins)) {
+			unset($cats[array_search('bundled', $cats)]);
+		}
+
 		return $cats;
 	}
 
diff --git a/engine/classes/ElggSite.php b/engine/classes/ElggSite.php
index 6d07778a9..e793ab9c6 100644
--- a/engine/classes/ElggSite.php
+++ b/engine/classes/ElggSite.php
@@ -423,6 +423,7 @@ class ElggSite extends ElggEntity {
 		// default public pages
 		$defaults = array(
 			'walled_garden/.*',
+			'login',
 			'action/login',
 			'register',
 			'action/register',
diff --git a/engine/lib/actions.php b/engine/lib/actions.php
index c6613e6d6..3a7c02488 100644
--- a/engine/lib/actions.php
+++ b/engine/lib/actions.php
@@ -273,8 +273,19 @@ function validate_action_token($visibleerrors = TRUE, $token = NULL, $ts = NULL)
 		} else if ($visibleerrors) {
 			register_error(elgg_echo('actiongatekeeper:tokeninvalid'));
 		}
-	} else if ($visibleerrors) {
-		register_error(elgg_echo('actiongatekeeper:missingfields'));
+	} else {
+		if (! empty($_SERVER['CONTENT_LENGTH']) && empty($_POST)) {
+			// The size of $_POST or uploaded file has exceed the size limit
+			$error_msg = elgg_trigger_plugin_hook('action_gatekeeper:upload_exceeded_msg', 'all', array(
+				'post_size' => $_SERVER['CONTENT_LENGTH'],
+				'visible_errors' => $visibleerrors,
+			), elgg_echo('actiongatekeeper:uploadexceeded'));
+		} else {
+			$error_msg = elgg_echo('actiongatekeeper:missingfields');
+		}
+		if ($visibleerrors) {
+			register_error($error_msg);
+		}
 	}
 
 	return FALSE;
diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index 928101fc5..b65d98c95 100644
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -244,6 +244,7 @@ function admin_init() {
 	elgg_register_action('profile/fields/delete', '', 'admin');
 	elgg_register_action('profile/fields/reorder', '', 'admin');
 
+	elgg_register_simplecache_view('css/admin');
 	elgg_register_simplecache_view('js/admin');
 	$url = elgg_get_simplecache_url('js', 'admin');
 	elgg_register_js('elgg.admin', $url);
@@ -571,7 +572,7 @@ function admin_markdown_page_handler($pages) {
 	if (!$plugin) {
 		$error = elgg_echo('admin:plugins:markdown:unknown_plugin');
 		$body = elgg_view_layout('admin', array('content' => $error, 'title' => $error));
-		echo elgg_view_page($title, $body, 'admin');
+		echo elgg_view_page($error, $body, 'admin');
 		return true;
 	}
 
diff --git a/engine/lib/cache.php b/engine/lib/cache.php
index c117b9ec9..be1c43e14 100644
--- a/engine/lib/cache.php
+++ b/engine/lib/cache.php
@@ -442,6 +442,7 @@ function _elgg_cache_init() {
 	}
 
 	if ($CONFIG->system_cache_enabled && !$CONFIG->i18n_loaded_from_cache) {
+		reload_all_translations();
 		foreach ($CONFIG->translations as $lang => $map) {
 			elgg_save_system_cache("$lang.php", serialize($map));
 		}
diff --git a/engine/lib/configuration.php b/engine/lib/configuration.php
index 9bf1529d6..305aa00b6 100644
--- a/engine/lib/configuration.php
+++ b/engine/lib/configuration.php
@@ -476,10 +476,12 @@ function get_config($name, $site_guid = 0) {
 			break;
 	}
 
+	// @todo these haven't really been implemented in Elgg 1.8. Complete in 1.9.
 	// show dep message
 	if ($new_name) {
+	//	$msg = "Config value $name has been renamed as $new_name";
 		$name = $new_name;
-		elgg_deprecated_notice($msg, $dep_version);
+	//	elgg_deprecated_notice($msg, $dep_version);
 	}
 
 	// decide from where to return the value
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index b55958a6c..62cb2d5bb 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -1053,12 +1053,14 @@ function _elgg_php_exception_handler($exception) {
  *
  * @return true
  * @access private
+ * @todo Replace error_log calls with elgg_log calls.
  */
 function _elgg_php_error_handler($errno, $errmsg, $filename, $linenum, $vars) {
 	$error = date("Y-m-d H:i:s (T)") . ": \"$errmsg\" in file $filename (line $linenum)";
 
 	switch ($errno) {
 		case E_USER_ERROR:
+		case E_RECOVERABLE_ERROR: // (e.g. type hint violation)
 			error_log("PHP ERROR: $error");
 			register_error("ERROR: $error");
 
@@ -1092,8 +1094,8 @@ function _elgg_php_error_handler($errno, $errmsg, $filename, $linenum, $vars) {
  *
  * @note No messages will be displayed unless debugging has been enabled.
  *
- * @param str $message User message
- * @param str $level   NOTICE | WARNING | ERROR | DEBUG
+ * @param string $message User message
+ * @param string $level   NOTICE | WARNING | ERROR | DEBUG
  *
  * @return bool
  * @since 1.7.0
@@ -2014,10 +2016,20 @@ function elgg_is_valid_options_for_batch_operation($options, $type) {
  *
  * @link http://docs.elgg.org/Tutorials/WalledGarden
  * @elgg_plugin_hook index system
+ *
+ * @param string $hook   The name of the hook
+ * @param string $type   The type of hook
+ * @param bool   $value  Has a plugin already rendered an index page?
+ * @param array  $params Array of parameters (should be empty)
  * @return bool
  * @access private
  */
-function elgg_walled_garden_index() {
+function elgg_walled_garden_index($hook, $type, $value, $params) {
+	if ($value) {
+		// do not create a second index page so return
+		return;
+	}
+
 	elgg_load_css('elgg.walled_garden');
 	elgg_load_js('elgg.walled_garden');
 	
@@ -2104,11 +2116,13 @@ function _elgg_engine_boot() {
 
 	_elgg_load_application_config();
 
-	register_translations(dirname(dirname(dirname(__FILE__))) . "/languages/");
-
 	_elgg_load_site_config();
 
+	_elgg_session_boot();
+
 	_elgg_load_cache();
+
+	_elgg_load_translations();
 }
 
 /**
@@ -2137,6 +2151,7 @@ function elgg_init() {
 	elgg_register_js('jquery.easing', 'vendors/jquery/jquery.easing.1.3.packed.js');
 	elgg_register_js('elgg.avatar_cropper', 'js/lib/ui.avatar_cropper.js');
 	elgg_register_js('jquery.imgareaselect', 'vendors/jquery/jquery.imgareaselect-0.9.8/scripts/jquery.imgareaselect.min.js');
+	elgg_register_js('elgg.ui.river', 'js/lib/ui.river.js');
 
 	elgg_register_css('jquery.imgareaselect', 'vendors/jquery/jquery.imgareaselect-0.9.8/css/imgareaselect-deprecated.css');
 	
diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index 4875b2c2f..d950261a2 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -331,7 +331,7 @@ function remove_subtype($type, $subtype) {
 }
 
 /**
- * Update a registered ElggEntity type, subtype, and classname
+ * Update a registered ElggEntity type, subtype, and class name
  *
  * @param string $type    Type
  * @param string $subtype Subtype
@@ -340,7 +340,7 @@ function remove_subtype($type, $subtype) {
  * @return bool
  */
 function update_subtype($type, $subtype, $class = '') {
-	global $CONFIG;
+	global $CONFIG, $SUBTYPE_CACHE;
 
 	if (!$id = get_subtype_id($type, $subtype)) {
 		return FALSE;
@@ -348,10 +348,16 @@ function update_subtype($type, $subtype, $class = '') {
 	$type = sanitise_string($type);
 	$subtype = sanitise_string($subtype);
 
-	return update_data("UPDATE {$CONFIG->dbprefix}entity_subtypes
+	$result = update_data("UPDATE {$CONFIG->dbprefix}entity_subtypes
 		SET type = '$type', subtype = '$subtype', class = '$class'
 		WHERE id = $id
 	");
+
+	if ($result && isset($SUBTYPE_CACHE[$id])) {
+		$SUBTYPE_CACHE[$id]->class = $class;
+	}
+
+	return $result;
 }
 
 /**
@@ -1452,6 +1458,7 @@ function enable_entity($guid, $recursive = true) {
 						'relationship' => 'disabled_with',
 						'relationship_guid' => $entity->guid,
 						'inverse_relationship' => true,
+						'limit' => 0,
 					));
 
 					foreach ($disabled_with_it as $e) {
@@ -1767,7 +1774,7 @@ function import_entity_plugin_hook($hook, $entity_type, $returnvalue, $params) {
 		if ($tmp) {
 			// Make sure its saved
 			if (!$tmp->save()) {
-				elgg_echo('ImportException:ProblemSaving', array($element->getAttribute('uuid')));
+				$msg = elgg_echo('ImportException:ProblemSaving', array($element->getAttribute('uuid')));
 				throw new ImportException($msg);
 			}
 
diff --git a/engine/lib/extender.php b/engine/lib/extender.php
index ffd3c1357..43421342c 100644
--- a/engine/lib/extender.php
+++ b/engine/lib/extender.php
@@ -105,6 +105,7 @@ function import_extender_plugin_hook($hook, $entity_type, $returnvalue, $params)
 
 		// Save
 		if (!$entity->save()) {
+			$attr_name = $element->getAttribute('name');
 			$msg = elgg_echo('ImportException:ProblemUpdatingMeta', array($attr_name, $entity_uuid));
 			throw new ImportException($msg);
 		}
@@ -120,7 +121,7 @@ function import_extender_plugin_hook($hook, $entity_type, $returnvalue, $params)
  * @param string $type        'metadata' or 'annotation'
  * @param int    $user_guid   The GUID of the user
  *
- * @return true|false
+ * @return bool
  */
 function can_edit_extender($extender_id, $type, $user_guid = 0) {
 	if (!elgg_is_logged_in()) {
@@ -155,7 +156,7 @@ function can_edit_extender($extender_id, $type, $user_guid = 0) {
 	}
 
 	// Trigger plugin hooks
-	$params = array('entity' => $entity, 'user' => $user);
+	$params = array('entity' => $extender->getEntity(), 'user' => $user);
 	return elgg_trigger_plugin_hook('permissions_check', $type, $params, false);
 }
 
diff --git a/engine/lib/filestore.php b/engine/lib/filestore.php
index 86f6d9baa..93a127257 100644
--- a/engine/lib/filestore.php
+++ b/engine/lib/filestore.php
@@ -149,6 +149,12 @@ $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0, $upscale = FALSE) {
 		return FALSE;
 	}
 
+	// color transparencies white (default is black)
+	imagefilledrectangle(
+		$new_image, 0, 0, $params['newwidth'], $params['newheight'],
+		imagecolorallocate($new_image, 255, 255, 255)
+	);
+
 	$rtn_code = imagecopyresampled(	$new_image,
 									$original_image,
 									0,
diff --git a/engine/lib/languages.php b/engine/lib/languages.php
index 7a508d298..15c48f902 100644
--- a/engine/lib/languages.php
+++ b/engine/lib/languages.php
@@ -8,6 +8,62 @@
  */
 
 /**
+ * Given a message key, returns an appropriately translated full-text string
+ *
+ * @param string $message_key The short message code
+ * @param array  $args        An array of arguments to pass through vsprintf().
+ * @param string $language    Optionally, the standard language code
+ *                            (defaults to site/user default, then English)
+ *
+ * @return string Either the translated string, the English string,
+ * or the original language string.
+ */
+function elgg_echo($message_key, $args = array(), $language = "") {
+	global $CONFIG;
+
+	static $CURRENT_LANGUAGE;
+
+	// old param order is deprecated
+	if (!is_array($args)) {
+		elgg_deprecated_notice(
+			'As of Elgg 1.8, the 2nd arg to elgg_echo() is an array of string replacements and the 3rd arg is the language.',
+			1.8
+		);
+
+		$language = $args;
+		$args = array();
+	}
+
+	if (!isset($CONFIG->translations)) {
+		// this means we probably had an exception before translations were initialized
+		register_translations(dirname(dirname(dirname(__FILE__))) . "/languages/");
+	}
+
+	if (!$CURRENT_LANGUAGE) {
+		$CURRENT_LANGUAGE = get_language();
+	}
+	if (!$language) {
+		$language = $CURRENT_LANGUAGE;
+	}
+
+	if (isset($CONFIG->translations[$language][$message_key])) {
+		$string = $CONFIG->translations[$language][$message_key];
+	} else if (isset($CONFIG->translations["en"][$message_key])) {
+		$string = $CONFIG->translations["en"][$message_key];
+	} else {
+		$string = $message_key;
+	}
+
+	// only pass through if we have arguments to allow backward compatibility
+	// with manual sprintf() calls.
+	if ($args) {
+		$string = vsprintf($string, $args);
+	}
+
+	return $string;
+}
+
+/**
  * Add a translation.
  *
  * Translations are arrays in the Zend Translation array format, eg:
@@ -82,56 +138,34 @@ function get_language() {
 	return false;
 }
 
-/**
- * Given a message shortcode, returns an appropriately translated full-text string
- *
- * @param string $message_key The short message code
- * @param array  $args        An array of arguments to pass through vsprintf().
- * @param string $language    Optionally, the standard language code
- *                            (defaults to site/user default, then English)
- *
- * @return string Either the translated string, the English string,
- * or the original language string.
- */
-function elgg_echo($message_key, $args = array(), $language = "") {
+function _elgg_load_translations() {
 	global $CONFIG;
 
-	static $CURRENT_LANGUAGE;
-
-	// old param order is deprecated
-	if (!is_array($args)) {
-		elgg_deprecated_notice(
-			'As of Elgg 1.8, the 2nd arg to elgg_echo() is an array of string replacements and the 3rd arg is the language.',
-			1.8
-		);
-
-		$language = $args;
-		$args = array();
-	}
+	if ($CONFIG->system_cache_enabled) {
+		$loaded = true;
+		$languages = array_unique(array('en', get_current_language()));
+		foreach ($languages as $language) {
+			$data = elgg_load_system_cache("$language.php");
+			if ($data) {
+				add_translation($language, unserialize($data));
+			} else {
+				$loaded = false;
+			}
+		}
 
-	if (!$CURRENT_LANGUAGE) {
-		$CURRENT_LANGUAGE = get_language();
-	}
-	if (!$language) {
-		$language = $CURRENT_LANGUAGE;
+		if ($loaded) {
+			$CONFIG->i18n_loaded_from_cache = true;
+			// this is here to force 
+			$CONFIG->language_paths[dirname(dirname(dirname(__FILE__))) . "/languages/"] = true;
+			return;
+		}
 	}
 
-	if (isset($CONFIG->translations[$language][$message_key])) {
-		$string = $CONFIG->translations[$language][$message_key];
-	} else if (isset($CONFIG->translations["en"][$message_key])) {
-		$string = $CONFIG->translations["en"][$message_key];
-	} else {
-		$string = $message_key;
-	}
+	// load core translations from languages directory
+	register_translations(dirname(dirname(dirname(__FILE__))) . "/languages/");
+}
 
-	// only pass through if we have arguments to allow backward compatibility
-	// with manual sprintf() calls.
-	if ($args) {
-		$string = vsprintf($string, $args);
-	}
 
-	return $string;
-}
 
 /**
  * When given a full path, finds translation files and loads them
@@ -145,16 +179,9 @@ function elgg_echo($message_key, $args = array(), $language = "") {
 function register_translations($path, $load_all = false) {
 	global $CONFIG;
 
-	static $load_from_cache;
-	static $cache_loaded_langs;
-	if (!isset($load_from_cache)) {
-		$load_from_cache = $CONFIG->system_cache_enabled;
-		$cache_loaded_langs = array();
-	}
-
 	$path = sanitise_filepath($path);
 
-	// Make a note of this path just in case we need to register this language later
+	// Make a note of this path just incase we need to register this language later
 	if (!isset($CONFIG->language_paths)) {
 		$CONFIG->language_paths = array();
 	}
@@ -162,6 +189,7 @@ function register_translations($path, $load_all = false) {
 
 	// Get the current language based on site defaults and user preference
 	$current_language = get_current_language();
+	elgg_log("Translations loaded from: $path");
 
 	// only load these files unless $load_all is true.
 	$load_language_files = array(
@@ -171,32 +199,6 @@ function register_translations($path, $load_all = false) {
 
 	$load_language_files = array_unique($load_language_files);
 
-	if ($load_from_cache && !$load_all) {
-		// load language files from cache
-		$data = array();
-		foreach ($load_language_files as $lang_file) {
-			$lang = substr($lang_file, 0, strpos($lang_file, '.'));
-			if (!isset($cache_loaded_langs[$lang])) {
-				$data[$lang] = elgg_load_system_cache($lang_file);
-				if ($data[$lang]) {
-					$cache_loaded_langs[$lang] = true;
-				} else {
-					// this language file not cached yet
-					$load_from_cache = false;
-				}
-			}
-		}
-
-		// are we still suppose to load from cache
-		if ($load_from_cache) {
-			foreach ($data as $lang => $map) {
-				add_translation($lang, unserialize($map));
-			}
-			$CONFIG->i18n_loaded_from_cache = true;
-			return true;
-		}
-	}
-
 	$handle = opendir($path);
 	if (!$handle) {
 		elgg_log("Could not open language path: $path", 'ERROR');
@@ -218,11 +220,6 @@ function register_translations($path, $load_all = false) {
 		}
 	}
 
-	elgg_log("Translations loaded from: $path");
-
-	// make sure caching code saves language data if system cache is on
-	$CONFIG->i18n_loaded_from_cache = false;
-
 	return $return;
 }
 
diff --git a/engine/lib/navigation.php b/engine/lib/navigation.php
index a7984ce5a..4ff009bfb 100644
--- a/engine/lib/navigation.php
+++ b/engine/lib/navigation.php
@@ -230,7 +230,7 @@ function elgg_pop_breadcrumb() {
 	global $CONFIG;
 
 	if (is_array($CONFIG->breadcrumbs)) {
-		array_pop($CONFIG->breadcrumbs);
+		return array_pop($CONFIG->breadcrumbs);
 	}
 
 	return FALSE;
diff --git a/engine/lib/pagehandler.php b/engine/lib/pagehandler.php
index a675d976a..46c7d059e 100644
--- a/engine/lib/pagehandler.php
+++ b/engine/lib/pagehandler.php
@@ -129,7 +129,7 @@ function elgg_error_page_handler($hook, $type, $result, $params) {
 		$content = elgg_view("errors/default", $params);
 	}
 	$body = elgg_view_layout('error', array('content' => $content));
-	echo elgg_view_page($title, $body, 'error');
+	echo elgg_view_page('', $body, 'error');
 	exit;
 }
 
diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php
index 39a76db5d..d5cd4fe76 100644
--- a/engine/lib/plugins.php
+++ b/engine/lib/plugins.php
@@ -311,6 +311,10 @@ function elgg_load_plugins() {
 		$start_flags = $start_flags & ~ELGG_PLUGIN_REGISTER_VIEWS;
 	}
 
+	if (elgg_get_config('i18n_loaded_from_cache')) {
+		$start_flags = $start_flags & ~ELGG_PLUGIN_REGISTER_LANGUAGES;
+	}
+
 	$return = true;
 	$plugins = elgg_get_plugins('active');
 	if ($plugins) {
diff --git a/engine/lib/river.php b/engine/lib/river.php
index 547d9495e..711832f70 100644
--- a/engine/lib/river.php
+++ b/engine/lib/river.php
@@ -55,7 +55,7 @@ $posted = 0, $annotation_id = 0) {
 	$posted = sanitise_int($posted);
 	$annotation_id = sanitise_int($annotation_id);
 
-	$params = array(
+	$values = array(
 		'type' => $type,
 		'subtype' => $subtype,
 		'action_type' => $action_type,
@@ -68,13 +68,13 @@ $posted = 0, $annotation_id = 0) {
 	);
 
 	// return false to stop insert
-	$params = elgg_trigger_plugin_hook('creating', 'river', null, $params);
-	if ($params == false) {
+	$values = elgg_trigger_plugin_hook('creating', 'river', null, $values);
+	if ($values == false) {
 		// inserting did not fail - it was just prevented
 		return true;
 	}
 
-	extract($params);
+	extract($values);
 
 	// Attempt to save river item; return success status
 	$id = insert_data("insert into {$CONFIG->dbprefix}river " .
diff --git a/engine/lib/sessions.php b/engine/lib/sessions.php
index 419d36707..72ca0a1c2 100644
--- a/engine/lib/sessions.php
+++ b/engine/lib/sessions.php
@@ -376,14 +376,10 @@ function logout() {
  *
  * @uses $_SESSION
  *
- * @param string $event       Event name
- * @param string $object_type Object type
- * @param mixed  $object      Object
- *
  * @return bool
  * @access private
  */
-function _elgg_session_boot($event, $object_type, $object) {
+function _elgg_session_boot() {
 	global $DB_PREFIX, $CONFIG;
 
 	// Use database for sessions
@@ -464,9 +460,6 @@ function _elgg_session_boot($event, $object_type, $object) {
 		return false;
 	}
 
-	// Since we have loaded a new user, this user may have different language preferences
-	register_translations(dirname(dirname(dirname(__FILE__))) . "/languages/");
-
 	return true;
 }
 
@@ -658,5 +651,3 @@ function _elgg_session_gc($maxlifetime) {
 
 	return true;
 }
-
-elgg_register_event_handler('boot', 'system', '_elgg_session_boot', 2);
diff --git a/engine/lib/statistics.php b/engine/lib/statistics.php
index e1f95ed97..5ee640549 100644
--- a/engine/lib/statistics.php
+++ b/engine/lib/statistics.php
@@ -95,8 +95,8 @@ function get_number_users($show_deactivated = false) {
  * @return string
   */
 function get_online_users() {
-	$count = find_active_users(600, 10, $offset, true);
-	$objects = find_active_users(600, 10, $offset);
+	$count = find_active_users(600, 10, 0, true);
+	$objects = find_active_users(600, 10);
 
 	if ($objects) {
 		return elgg_view_entity_list($objects, array(
diff --git a/engine/lib/system_log.php b/engine/lib/system_log.php
index 28d90be56..53fa24557 100644
--- a/engine/lib/system_log.php
+++ b/engine/lib/system_log.php
@@ -156,9 +156,8 @@ function get_object_from_log_entry($entry_id) {
  * This is called by the event system and should not be called directly.
  *
  * @param object $object The object you're talking about.
- * @param string $event  String The event being logged
- *
- * @return mixed
+ * @param string $event  The event being logged
+ * @return void
  */
 function system_log($object, $event) {
 	global $CONFIG;
@@ -166,6 +165,12 @@ function system_log($object, $event) {
 	static $cache_size = 0;
 
 	if ($object instanceof Loggable) {
+
+		if (datalist_get('version') < 2012012000) {
+			// this is a site that doesn't have the ip_address column yet
+			return;
+		}
+
 		// reset cache if it has grown too large
 		if (!is_array($log_cache) || $cache_size > 500) {
 			$log_cache = array();
@@ -213,8 +218,6 @@ function system_log($object, $event) {
 			$log_cache[$time][$object_id][$event] = true;
 			$cache_size += 1;
 		}
-
-		return true;
 	}
 }
 
diff --git a/engine/lib/users.php b/engine/lib/users.php
index e209f2c38..241b524f9 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -810,6 +810,12 @@ function validate_username($username) {
 		$msg = elgg_echo('registration:usernametooshort', array($CONFIG->minusername));
 		throw new RegistrationException($msg);
 	}
+	
+	// username in the database has a limit of 128 characters
+	if (strlen($username) > 128) {
+		$msg = elgg_echo('registration:usernametoolong', array(128));
+		throw new RegistrationException($msg);
+	}
 
 	// Blacklist for bad characters (partially nicked from mediawiki)
 	$blacklist = '/[' .
@@ -1556,7 +1562,7 @@ function users_init() {
 	elgg_register_action('friends/remove');
 	elgg_register_action('avatar/upload');
 	elgg_register_action('avatar/crop');
-	elgg_register_action('avatar/revert');
+	elgg_register_action('avatar/remove');
 	elgg_register_action('profile/edit');
 
 	elgg_register_action('friends/collections/add');
diff --git a/engine/lib/views.php b/engine/lib/views.php
index 1b013be6f..c98ad4e78 100644
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -403,7 +403,7 @@ function elgg_view($view, $vars = array(), $bypass = false, $debug = false, $vie
 	$view_orig = $view;
 
 	// Trigger the pagesetup event
-	if (!isset($CONFIG->pagesetupdone)) {
+	if (!isset($CONFIG->pagesetupdone) && $CONFIG->boot_complete) {
 		$CONFIG->pagesetupdone = true;
 		elgg_trigger_event('pagesetup', 'system');
 	}
diff --git a/engine/start.php b/engine/start.php
index 506e27380..5f4bded45 100644
--- a/engine/start.php
+++ b/engine/start.php
@@ -49,6 +49,7 @@ global $CONFIG;
 if (!isset($CONFIG)) {
 	$CONFIG = new stdClass;
 }
+$CONFIG->boot_complete = false;
 
 $lib_dir = dirname(__FILE__) . '/lib/';
 
@@ -105,5 +106,7 @@ elgg_trigger_event('plugins_boot', 'system');
 // Complete the boot process for both engine and plugins
 elgg_trigger_event('init', 'system');
 
+$CONFIG->boot_complete = true;
+
 // System loaded and ready
 elgg_trigger_event('ready', 'system');
diff --git a/engine/tests/api/metadata.php b/engine/tests/api/metadata.php
index 2461e975e..244036f80 100644
--- a/engine/tests/api/metadata.php
+++ b/engine/tests/api/metadata.php
@@ -43,9 +43,6 @@ class ElggCoreMetadataAPITest extends ElggCoreUnitTest {
 		{
 			$this->assertTrue(in_array($string, $this->metastrings));
 		}
-
-		// clean up
-		$this->delete_metastrings();
 	}
 
 	public function testElggGetEntitiesFromMetadata() {
@@ -77,7 +74,6 @@ class ElggCoreMetadataAPITest extends ElggCoreUnitTest {
 
 		// clean up
 		$this->object->delete();
-		$this->delete_metastrings();
 	}
 
 	public function testElggGetMetadataCount() {
@@ -206,12 +202,4 @@ class ElggCoreMetadataAPITest extends ElggCoreUnitTest {
 		mysql_query("INSERT INTO {$CONFIG->dbprefix}metastrings (string) VALUES ('$string')");
 		$this->metastrings[$string] = mysql_insert_id();
 	}
-
-	protected function delete_metastrings() {
-		global $CONFIG, $METASTRINGS_CACHE, $METASTRINGS_DEADNAME_CACHE;
-		$METASTRINGS_CACHE = $METASTRINGS_DEADNAME_CACHE = array();
-
-		$strings = implode(', ', $this->metastrings);
-		mysql_query("DELETE FROM {$CONFIG->dbprefix}metastrings WHERE id IN ($strings)");
-	}
 }