diff options
Diffstat (limited to 'boot.php')
| -rwxr-xr-x | boot.php | 37 |
1 files changed, 7 insertions, 30 deletions
@@ -50,7 +50,8 @@ define ( 'PLATFORM_NAME', 'hubzilla' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'H'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1159 ); +define ( 'DB_UPDATE_VERSION', 1160 ); + /** * @brief Constant with a HTML line break. @@ -82,6 +83,7 @@ $DIRECTORY_FALLBACK_SERVERS = array( 'https://hubzilla.site', 'https://red.zottel.red', 'https://gravizot.de', + 'https://blablanet.com', 'https://my.federated.social' ); @@ -421,6 +423,7 @@ define ( 'TERM_SAVEDSEARCH', 6 ); define ( 'TERM_THING', 7 ); define ( 'TERM_BOOKMARK', 8 ); define ( 'TERM_HIERARCHY', 9 ); +define ( 'TERM_COMMUNITYTAG', 10 ); define ( 'TERM_OBJ_POST', 1 ); define ( 'TERM_OBJ_PHOTO', 2 ); @@ -936,26 +939,6 @@ class App { return $this->groups; } - function set_widget($title,$html, $location = 'aside') { - $this->widgets[] = array('title' => $title, 'html' => $html, 'location' => $location); - } - - function get_widgets($location = '') { - if($location && count($this->widgets)) { - $ret = array(); - foreach($this->widgets as $w) { - if ($w['location'] == $location) - $ret[] = $w; - } - $arr = array('location' => $location, 'widgets' => $ret); - call_hooks('get_widgets', $arr); - return $arr['widgets']; - } - $arr = array('location' => $location, 'widgets' => $this->widgets); - call_hooks('get_widgets', $arr); - return $arr['widgets']; - } - function set_pager_total($n) { $this->pager['total'] = intval($n); } @@ -2075,15 +2058,8 @@ function construct_page(&$a) { $a->build_pagehead(); - $arr = $a->get_widgets(); - ksort($arr, SORT_NUMERIC); - if(count($arr)) { - foreach($arr as $x) { - if(! array_key_exists($x['location'], $a->page)) - $a->page[$x['location']] = ''; - - $a->page[$x['location']] .= $x['html']; - } + if($a->page['pdl_content']) { + $a->page['content'] = comanche_region($a,$a->page['content']); } // Let's say we have a comanche declaration '[region=nav][/region][region=content]$nav $content[/region]'. @@ -2100,6 +2076,7 @@ function construct_page(&$a) { call_hooks('construct_page', $arr); $a->layout = $arr['layout']; + foreach($a->layout as $k => $v) { if((strpos($k, 'region_') === 0) && strlen($v)) { if(strpos($v, '$region_') !== false) { |