diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/comanche.php | 21 | ||||
| -rw-r--r-- | include/dir_fns.php | 5 | ||||
| -rwxr-xr-x | include/items.php | 2 |
3 files changed, 22 insertions, 6 deletions
diff --git a/include/comanche.php b/include/comanche.php index 93cbd8b12..9fe7dc255 100644 --- a/include/comanche.php +++ b/include/comanche.php @@ -175,12 +175,12 @@ function comanche_block($s, $class = '') { } if($r[0]['title'] && trim($r[0]['title']) === '$content' && get_app()->data['webpage'][0]['title']) { - $o .= '<h3>' . get_app()->data['webpage'][0]['title'] . '</h3>'; + $o .= '<h3>' . get_app()->page['title'] . '</h3>'; } if(trim($r[0]['body']) === '$content') { - $o .= prepare_text(get_app()->data['webpage'][0]['body'], get_app()->data['webpage'][0]['mimetype']); + $o .= prepare_text(get_app()->page['content'], get_app()->data['webpage'][0]['mimetype']); } else { $o .= prepare_text($r[0]['body'], $r[0]['mimetype']); @@ -202,9 +202,17 @@ function comanche_js($s) { case 'bootstrap': $path = 'library/bootstrap/js/bootstrap.min.js'; break; + case 'foundation': + $path = 'library/foundation/js/foundation.min.js'; + $init = "\r\n" . '<script>$(document).ready(function() { $(document).foundation(); });</script>'; + break; } - return '<script src="' . z_root() . '/' . $path . '" ></script>'; + $ret = '<script src="' . z_root() . '/' . $path . '" ></script>'; + if($init) + $ret .= $init; + + return $ret; } @@ -214,9 +222,14 @@ function comanche_css($s) { case 'bootstrap': $path = 'library/bootstrap/css/bootstrap.min.css'; break; + case 'foundation': + $path = 'library/foundation/css/foundation.min.css'; + break; } - return '<link rel="stylesheet" href="' . z_root() . '/' . $path . '" type="text/css" media="screen">'; + $ret = '<link rel="stylesheet" href="' . z_root() . '/' . $path . '" type="text/css" media="screen">'; + + return $ret; } diff --git a/include/dir_fns.php b/include/dir_fns.php index ebaa7c427..77c78558c 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -431,10 +431,13 @@ function local_dir_update($uid, $force) { ); } + $arr = array('channel_id' => $uid, 'hash' => $hash, 'profile' => $profile); + call_hooks('local_dir_update', $arr); + $address = $p[0]['channel_address'] . '@' . get_app()->get_hostname(); if (perm_is_allowed($uid, '', 'view_profile')) { - import_directory_profile($hash, $profile, $address, 0); + import_directory_profile($hash, $arr['profile'], $address, 0); } else { // they may have made it private $r = q("delete from xprof where xprof_hash = '%s'", diff --git a/include/items.php b/include/items.php index 0f0f1a234..71d4213b7 100755 --- a/include/items.php +++ b/include/items.php @@ -976,7 +976,7 @@ function import_author_diaspora($x) { ); if($r) { logger('in_cache: ' . $x['address'], LOGGER_DATA); - return $r[0]['chan_hash']; + return $r[0]['xchan_hash']; } if(discover_by_webbie($x['address'])) { |