Merge remote-tracking branch 'friendika/master' into newui

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 050cf10ce817615599c43d378b8e81eaa94a45c1..28467006da4c03f538511a33cb0bf688eb3559d9 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -5,11 +5,12 @@ require_once('include/network.php');
 require_once('include/plugin.php');
 require_once('include/text.php');
 require_once("include/pgettext.php");
+require_once('include/nav.php');
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.1075' );
+define ( 'FRIENDIKA_VERSION',      '2.2.1083' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
-define ( 'DB_UPDATE_VERSION',      1080      );
+define ( 'DB_UPDATE_VERSION',      1082      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -939,10 +940,10 @@ function profile_sidebar($profile, $block = 0) {
 <img class="photo avatar" height="50px" width="50px" src="$photo50">
 </dd>
 </dl>
-<dl class='entity_searchable'>
+<dl class="entity_searchable">
 <dt>Searchable</dt>
 <dd>
-<span class='searchable'>$searchable</span>
+<span class="searchable">$searchable</span>
 </dd>
 </dl>
 </div>
@@ -1169,3 +1170,4 @@ function load_contact_links($uid) {
        $a->contacts = $ret;
        return;         
 }}
+