aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
Diffstat (limited to 'boot.php')
-rwxr-xr-xboot.php14
1 files changed, 13 insertions, 1 deletions
diff --git a/boot.php b/boot.php
index de82f951d..09a8bef7e 100755
--- a/boot.php
+++ b/boot.php
@@ -605,6 +605,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
@@ -888,6 +889,7 @@ class App {
$this->observer = $xchan;
}
+
function get_observer() {
return $this->observer;
}
@@ -900,6 +902,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;
}
@@ -2093,7 +2103,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);
}