initial dfrn update to pass perms

[friendica.git] / mod / profile.php

diff --git a/mod/profile.php b/mod/profile.php
index ab1e8f738455653e3ef8308095fcb28b3b91caa9..88e23a8a46c945488267459ea81337ccfe08d3c6 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -106,16 +106,9 @@ function profile_content(&$a, $update = 0) {
 
 
                if($tab === 'profile') {
-                       $profile_lang = get_config('system','language');
-                       if(! $profile_lang)
-                               $profile_lang = 'en';
-                       if(file_exists("view/$profile_lang/profile_advanced.php"))
-                               require_once("view/$profile_lang/profile_advanced.php");
-                       else
-                               require_once('view/profile_advanced.php');
-
+                       require_once('include/profile_advanced.php');
+                       $o .= advanced_profile($a);
                        call_hooks('profile_advanced',$o);
-
                        return $o;
                }
 
@@ -391,6 +384,8 @@ function profile_content(&$a, $update = 0) {
                                                '$mylink' => $contact['url'],
                                                '$mytitle' => t('This is you'),
                                                '$myphoto' => $contact['thumb'],
+                                               '$comment' => t('Comment'),
+                                               '$submit' => t('Submit'),
                                                '$ww' => ''
                                        ));
                                }
@@ -402,7 +397,7 @@ function profile_content(&$a, $update = 0) {
                        // This is my profile page but I'm not the author of this post/comment. If it's somebody that's a fan or mutual friend,
                        // I can go directly to their profile as an authenticated guest.
 
-                       if(local_user() && ($item['contact-uid'] == $_SESSION['uid']) 
+                       if(local_user() && ($item['contact-uid'] == local_user()) 
                                && ($item['network'] === 'dfrn') && (! $item['self'] )) {
                                $profile_url = $redirect_url;
                                $sparkle = ' sparkle';