harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
redmatrix
2015-05-17 19:48:57 -07:00
parent dd72f580dd ac3b886cc4
commit 76558df966
29 changed files with 602 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
boot.php
View File

@@ -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);
}