Merge https://github.com/friendica/friendica into pull

diff --combined boot.php
index f4dce840f860fa7eeb523efd2a653e94ff8fba20,8a921473c7bb6bd4335fe7d4f23be46fecb566ad..77be9ac26125145b9e47046b14e21d7cd967ffb3
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -12,7 -12,7 +12,7 @@@ require_once('library/Mobile_Detect/Mob
  require_once('include/features.php');
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
 -define ( 'FRIENDICA_VERSION',      '3.1.1565' );
 +define ( 'FRIENDICA_VERSION',      '3.1.1569' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
  define ( 'DB_UPDATE_VERSION',      1157      );
  
@@@ -969,16 -969,7 +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 +988,13 @@@
        
                        '$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);
@@@ -1348,15 -1346,10 +1346,10 @@@ 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);
- 
                if($a->theme['template_engine'] === 'internal')
                        $location = template_escape($location);
  
-               $o .= replace_macros($tpl, $includes + array(
+               $o .= replace_macros($tpl, array(
                        '$profile' => $profile,
                        '$connect'  => $connect,
                        '$wallmessage' => $wallmessage,
@@@ -1365,7 -1358,7 +1358,7 @@@
                        '$pdesc'        => $pdesc,
                        '$marital'  => $marital,
                        '$homepage' => $homepage,
-                       '$diaspora_info' => $diaspora,
+                       '$diaspora' => $diaspora,
                        '$contact_block' => $contact_block,
                ));
  
@@@ -1946,3 -1939,18 +1939,18 @@@ function clear_cache($basepath = "", $p
                closedir($dh);
        }
  }
+ 
+ function set_template_engine(&$a, $engine = 'internal') {
+ 
+       $a->theme['template_engine'] = 'internal';
+ 
+       if(is_writable('view/smarty3/')) {
+               switch($engine) {
+                       case 'smarty3':
+                               $a->theme['template_engine'] = 'smarty3';
+                               break;
+                       default:
+                               break;
+               }
+       }
+ }