Merge github.com:Elgg/Elgg

Conflicts:
	engine/lib/input.php

6 files changed, 46 insertions, 17 deletions

diff --git a/pages/account/login.php b/pages/account/login.php
new file mode 100644
index 000000000..14f65cc3f
--- /dev/null
+++ b/pages/account/login.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Assembles and outputs a login page.
+ *
+ * This page serves as a fallback for non-JS users who click on the login
+ * drop down link.
+ *
+ * If the user is logged in, this page will forward to the front page.
+ *
+ * @package Elgg.Core
+ * @subpackage Accounts
+ */
+
+if (elgg_is_logged_in()) {
+	forward('');
+}
+
+$login_box = elgg_view('core/account/login_box');
+$content = elgg_view_layout('one_column', array('content' => $login_box));
+echo elgg_view_page(elgg_echo('login'), $content);
diff --git a/pages/account/register.php b/pages/account/register.php
index 5eb2b4001..cf18a635b 100644
--- a/pages/account/register.php
+++ b/pages/account/register.php
@@ -37,7 +37,7 @@ if (elgg_get_config('https_login')) {
 }
 $form_params = array(
 	'action' => $register_url,
-	'class' => 'elgg-form-account float',
+	'class' => 'elgg-form-account',
 );
 
 $body_params = array(
diff --git a/pages/avatar/view.php b/pages/avatar/view.php
index eb2cd1010..bd6c95821 100644
--- a/pages/avatar/view.php
+++ b/pages/avatar/view.php
@@ -3,6 +3,7 @@
  * View an avatar
  */
 
+// page owner library sets this based on URL
 $user = elgg_get_page_owner_entity();
 
 // Get the size
@@ -13,33 +14,41 @@ if (!in_array($size, array('master', 'large', 'medium', 'small', 'tiny', 'topbar
 
 // If user doesn't exist, return default icon
 if (!$user) {
-	$url = "_graphics/icons/user/default{$size}";
+	$url = "_graphics/icons/default/{$size}.png";
 	$url = elgg_normalize_url($url);
 	forward($url);
 }
 
+$user_guid = $user->getGUID();
+
 // Try and get the icon
 $filehandler = new ElggFile();
-$filehandler->owner_guid = $user->getGUID();
-$filehandler->setFilename("profile/" .  $user->getGUID() . $size . ".jpg");
+$filehandler->owner_guid = $user_guid;
+$filehandler->setFilename("profile/{$user_guid}{$size}.jpg");
 
 $success = false;
-if ($filehandler->open("read")) {
-	if ($contents = $filehandler->read($filehandler->size())) {
-		$success = true;
+
+try {
+	if ($filehandler->open("read")) {
+		if ($contents = $filehandler->read($filehandler->size())) {
+			$success = true;
+		}
 	}
+} catch (InvalidParameterException $e) {
+	elgg_log("Unable to get avatar for user with GUID $user_guid", 'ERROR');
 }
 
+
 if (!$success) {
-	$url = "_graphics/icons/user/default{$size}";
+	$url = "_graphics/icons/default/{$size}.png";
 	$url = elgg_normalize_url($url);
 	forward($url);
 }
 
-header("Content-type: image/jpeg");
-header('Expires: ' . date('r', time() + 864000));
-header("Pragma: public");
-header("Cache-Control: public");
+header("Content-type: image/jpeg", true);
+header('Expires: ' . date('r', strtotime("+6 months")), true);
+header("Pragma: public", true);
+header("Cache-Control: public", true);
 header("Content-Length: " . strlen($contents));
 
 echo $contents;
diff --git a/pages/entities/index.php b/pages/entities/index.php
index d3b935dc4..e73d65db4 100644
--- a/pages/entities/index.php
+++ b/pages/entities/index.php
@@ -25,9 +25,9 @@ if ($context) {
 // Get the entity, if possible
 if ($entity = get_entity($guid)) {
 	if ($entity->container_guid) {
-		set_page_owner($entity->container_guid);
+		elgg_set_page_owner_guid($entity->container_guid);
 	} else {
-		set_page_owner($entity->owner_guid);
+		elgg_set_page_owner_guid($entity->owner_guid);
 	}
 
 	// Set the body to be the full view of the entity, and the title to be its title
diff --git a/pages/settings/account.php b/pages/settings/account.php
index e6a5da97b..1bf71973b 100644
--- a/pages/settings/account.php
+++ b/pages/settings/account.php
@@ -11,12 +11,12 @@ gatekeeper();
 
 // Make sure we don't open a security hole ...
 if ((!elgg_get_page_owner_entity()) || (!elgg_get_page_owner_entity()->canEdit())) {
-	set_page_owner(elgg_get_logged_in_user_guid());
+	elgg_set_page_owner_guid(elgg_get_logged_in_user_guid());
 }
 
 $title = elgg_echo('usersettings:user');
 
-$content .= elgg_view('core/settings/account');
+$content = elgg_view('core/settings/account');
 
 $params = array(
 	'content' => $content,
diff --git a/pages/settings/statistics.php b/pages/settings/statistics.php
index b7394cbe8..9df71ec5e 100644
--- a/pages/settings/statistics.php
+++ b/pages/settings/statistics.php
@@ -11,7 +11,7 @@ gatekeeper();
 
 // Make sure we don't open a security hole ...
 if ((!elgg_get_page_owner_entity()) || (!elgg_get_page_owner_entity()->canEdit())) {
-	set_page_owner(elgg_get_logged_in_user_guid());
+	elgg_set_page_owner_guid(elgg_get_logged_in_user_guid());
 }
 
 $title = elgg_echo("usersettings:statistics");