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 );
$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'),
'$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);
$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,
'$pdesc' => $pdesc,
'$marital' => $marital,
'$homepage' => $homepage,
- '$diaspora_info' => $diaspora,
+ '$diaspora' => $diaspora,
'$contact_block' => $contact_block,
));