aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorroot <root@diekershoff.homeunix.net>2011-01-19 17:55:27 +0100
committerroot <root@diekershoff.homeunix.net>2011-01-19 17:55:27 +0100
commit8e22c669a0668fc0498e9c1d822dcefd97bae1e5 (patch)
treef342d0587a151ed6ef76c9832ab60b6644b34031 /boot.php
parent13fa27f7578d292d8d722554ce6211e8e0bc91af (diff)
parent766ade06d5e3b387d1fd3d2d0b00b15852e877b1 (diff)
downloadvolse-hubzilla-8e22c669a0668fc0498e9c1d822dcefd97bae1e5.tar.gz
volse-hubzilla-8e22c669a0668fc0498e9c1d822dcefd97bae1e5.tar.bz2
volse-hubzilla-8e22c669a0668fc0498e9c1d822dcefd97bae1e5.zip
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'boot.php')
-rw-r--r--boot.php14
1 files changed, 11 insertions, 3 deletions
diff --git a/boot.php b/boot.php
index 85e159883..d7f32dbaf 100644
--- a/boot.php
+++ b/boot.php
@@ -2,8 +2,8 @@
set_time_limit(0);
-define ( 'BUILD_ID', 1032 );
-define ( 'FRIENDIKA_VERSION', '2.01.1003' );
+define ( 'BUILD_ID', 1033 );
+define ( 'FRIENDIKA_VERSION', '2.01.1004' );
define ( 'DFRN_PROTOCOL_VERSION', '2.0' );
define ( 'EOL', "<br />\r\n" );
@@ -2009,8 +2009,12 @@ function profile_sidebar($profile) {
if((! is_array($profile)) && (! count($profile)))
return $o;
+ call_hooks('profile_sidebar_enter', $profile);
+
$fullname = '<div class="fn">' . $profile['name'] . '</div>';
+ $pdesc = '<div class="title">' . $profile['pdesc'] . '</div>';
+
$tabs = '';
$photo = '<div id="profile=photo-wrapper"><img class="photo" src="' . $profile['photo'] . '" alt="' . $profile['name'] . '" /></div>';
@@ -2049,6 +2053,7 @@ function profile_sidebar($profile) {
$o .= replace_macros($tpl, array(
'$fullname' => $fullname,
+ '$pdesc' => $pdesc,
'$tabs' => $tabs,
'$photo' => $photo,
'$connect' => $connect,
@@ -2059,7 +2064,10 @@ function profile_sidebar($profile) {
'$homepage' => $homepage
));
- call_hooks('profile_sidebar', $o);
+
+ $arr = array('profile' => $profile, 'entry' => $o);
+
+ call_hooks('profile_sidebar', $arr);
return $o;
}}