Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	include/bb2diaspora.php
	include/diaspora.php
	include/enotify.php
	mod/admin.php
	mod/cloud.php
	mod/dav.php
	mod/home.php
	mod/invite.php
	mod/like.php
	mod/mitem.php
	mod/p.php
	mod/pubsites.php
	mod/setup.php
	mod/siteinfo.php
	util/messages.po

1 files changed, 13 insertions, 1 deletions

diff --git a/boot.php b/boot.php
index 43cacb3cb..ca10d0f78 100755
--- a/boot.php
+++ b/boot.php
@@ -651,6 +651,7 @@ class App {
 	public  $observer   = null;            // xchan record of the page observer
 	public  $profile_uid = 0;              // If applicable, the channel_id of the "page owner"
 	public  $poi        = null;            // "person of interest", generally a referenced connection
+	private $oauth_key  = null;            // consumer_id of oauth request, if used
 	public  $layout     = array();         // Comanche parsed template
 	public  $pdl        = null;
 	private $perms      = null;            // observer permissions
@@ -934,6 +935,7 @@ class App {
 		$this->observer = $xchan;
 	}
 
+
 	function get_observer() {
 		return $this->observer;
 	}
@@ -946,6 +948,14 @@ class App {
 		return $this->perms;
 	}
 
+	function set_oauth_key($consumer_id) {
+		$this->oauth_key = $consumer_id;
+	}
+
+	function get_oauth_key() {
+		return $this->oauth_key;
+	}
+
 	function get_apps() {
 		return $this->apps;
 	}
@@ -2139,7 +2149,9 @@ function construct_page(&$a) {
 				}
 
 				// And a couple of convenience macros
-
+				if(strpos($v, '$htmlhead') !== false) {
+					$v = str_replace('$htmlhead', $a->page['htmlhead'], $v);
+				}
 				if(strpos($v, '$nav') !== false) {
 					$v = str_replace('$nav', $a->page['nav'], $v);
 				}