aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-11-09 19:42:37 -0800
committerredmatrix <redmatrix@redmatrix.me>2015-11-09 19:42:37 -0800
commite6de9bfa4ebe1fb1c7dd05c0d572c7d79d3323ee (patch)
tree3bc5833ef1ba4ed3278bbbf49681f16f024ccf96
parentc0260ff7018c1f29cf27d6fdb6ff6c7e4db5fff4 (diff)
downloadvolse-hubzilla-e6de9bfa4ebe1fb1c7dd05c0d572c7d79d3323ee.tar.gz
volse-hubzilla-e6de9bfa4ebe1fb1c7dd05c0d572c7d79d3323ee.tar.bz2
volse-hubzilla-e6de9bfa4ebe1fb1c7dd05c0d572c7d79d3323ee.zip
get rid of the pre-comanche widget placement and wgl code
-rwxr-xr-xboot.php31
-rw-r--r--doc/hook/get_widgets.bb1
-rw-r--r--doc/hooklist.bb3
-rw-r--r--include/identity.php13
4 files changed, 0 insertions, 48 deletions
diff --git a/boot.php b/boot.php
index 48bf54804..f9b826bb7 100755
--- a/boot.php
+++ b/boot.php
@@ -937,26 +937,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);
}
@@ -2076,17 +2056,6 @@ 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'];
- }
- }
-
// Let's say we have a comanche declaration '[region=nav][/region][region=content]$nav $content[/region]'.
// The text 'region=' identifies a section of the layout by that name. So what we want to do here is leave
// $a->page['nav'] empty and put the default content from $a->page['nav'] and $a->page['section']
diff --git a/doc/hook/get_widgets.bb b/doc/hook/get_widgets.bb
deleted file mode 100644
index 54b43858a..000000000
--- a/doc/hook/get_widgets.bb
+++ /dev/null
@@ -1 +0,0 @@
-[h2]get_widgets[/h2]
diff --git a/doc/hooklist.bb b/doc/hooklist.bb
index 666a34ca2..0b9cc17ee 100644
--- a/doc/hooklist.bb
+++ b/doc/hooklist.bb
@@ -209,9 +209,6 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the
[zrl=[baseurl]/help/hook/get_role_perms]get_role_perms[/zrl]
Called when get_role_perms() is called to obtain permissions for named permission roles
-[zrl=[baseurl]/help/hook/get_widgets]get_widgets[/zrl]
- No longer used - now widget placement is managed by Comanche
-
[zrl=[baseurl]/help/hook/global_permissions]global_permissions[/zrl]
Called when the global permissions list is generated
diff --git a/include/identity.php b/include/identity.php
index 0c4a9df45..21d919508 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -904,19 +904,6 @@ function profile_load(&$a, $nickname, $profile = '') {
}
/**
- * @brief
- *
- * @param App &$a
- * @param boolean $connect
- */
-function profile_create_sidebar(&$a, $connect = true) {
-
- $block = (((get_config('system', 'block_public')) && (! local_channel()) && (! remote_channel())) ? true : false);
-
- $a->set_widget('profile', profile_sidebar($a->profile, $block, $connect));
-}
-
-/**
* @brief Formats a profile for display in the sidebar.
*
* It is very difficult to templatise the HTML completely