rev update

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index d8bc174b4a25c8bb64ff85713d02e3f8367eda63..9fd9b2c6484f36b0c98f0fdd503192f348534c29 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.1.1565' );
+define ( 'FRIENDICA_VERSION',      '3.1.1575' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1157      );
 
@@ -969,16 +969,7 @@ if(! function_exists('login')) {
                        $a->module = 'login';
                }
 
-
-               $includes = array(
-                       '$field_input' => 'field_input.tpl',
-                       '$field_password' => 'field_password.tpl',
-                       '$field_openid' => 'field_openid.tpl',
-                       '$field_checkbox' => 'field_checkbox.tpl',
-               );
-               $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-               $o .= replace_macros($tpl,$includes + array(
+               $o .= replace_macros($tpl, array(
 
                        '$dest_url'     => $dest_url,
                        '$logout'       => t('Logout'),
@@ -997,6 +988,13 @@ if(! function_exists('login')) {
        
                        '$lostpass'     => t('Forgot your password?'),
                        '$lostlink'     => t('Password Reset'),
+
+                       '$tostitle'     => t('Website Terms of Service'),
+                       '$toslink'      => t('terms of service'),
+
+                       '$privacytitle' => t('Website Privacy Policy'),
+                       '$privacylink'  => t('privacy policy'),
+
                ));
 
                call_hooks('login_hook',$o);
@@ -1347,17 +1345,17 @@ if(! function_exists('profile_sidebar')) {
 
                $tpl = get_markup_template('profile_vcard.tpl');
 
-
-               $includes = array(
-                       '$diaspora_vcard' => 'diaspora_vcard.tpl'
-               );
-               $includes = set_template_includes($a->theme['template_engine'], $includes);
+               $p = array();
+               foreach($profile as $k => $v) {
+                       $k = str_replace('-','_',$k);
+                       $p[$k] = $v;
+               }
 
                if($a->theme['template_engine'] === 'internal')
                        $location = template_escape($location);
 
-               $o .= replace_macros($tpl, $includes + array(
-                       '$profile' => $profile,
+               $o .= replace_macros($tpl, array(
+                       '$profile' => $p,
                        '$connect'  => $connect,
                        '$wallmessage' => $wallmessage,
                        '$location' => $location,
@@ -1365,7 +1363,7 @@ if(! function_exists('profile_sidebar')) {
                        '$pdesc'        => $pdesc,
                        '$marital'  => $marital,
                        '$homepage' => $homepage,
-                       '$diaspora_info' => $diaspora,
+                       '$diaspora' => $diaspora,
                        '$contact_block' => $contact_block,
                ));