Merge remote-tracking branch 'upstream/master'

Conflicts:
	boot.php
	include/items.php
	update.php

diff --cc boot.php
index 6864e53,015dfb5..cd7fa03
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -12,10 -12,10 +12,9 @@@ require_once('library/Mobile_Detect/Mob
  require_once('include/features.php');
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
- define ( 'FRIENDICA_VERSION',      '3.1.1572' );
+ define ( 'FRIENDICA_VERSION',      '3.1.1589' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 -define ( 'DB_UPDATE_VERSION',      1158      );
 -
 +define ( 'DB_UPDATE_VERSION',      1159      );
- 
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
  

diff --cc database.sql
Simple merge

diff --cc include/bbcode.php
Simple merge

diff --cc include/conversation.php
Simple merge

diff --cc include/items.php
index 3779126,08127c6..54b392b
--- 1/include/items.php
--- 2/include/items.php
+++ b/include/items.php
@@@ -5,8 -5,7 +5,9 @@@ require_once('include/oembed.php')
  require_once('include/salmon.php');
  require_once('include/crypto.php');
  require_once('include/Photo.php');
 +require_once('include/tags.php');
 +require_once('include/text.php');
+ require_once('include/email.php');
  
  function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) {
  
@@@ -3410,12 -3370,12 +3411,12 @@@ function new_follower($importer,$contac
                                        '$sitename' => $a->config['sitename']
                                ));
                                $res = mail($r[0]['email'], 
-                                       (($sharing) ? t('A new person is sharing with you at ') : t("You have a new follower at ")) . $a->config['sitename'],
+                                       email_header_encode((($sharing) ? t('A new person is sharing with you at ') : t("You have a new follower at ")) . $a->config['sitename'],'UTF-8'),
                                        $email,
-                                       'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+                                       'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n"
                                        . 'Content-type: text/plain; charset=UTF-8' . "\n"
                                        . 'Content-transfer-encoding: 8bit' );
 -                      
 +
                        }
                }
        }

diff --cc include/text.php
Simple merge

diff --cc object/Item.php
Simple merge

diff --cc update.php
index 4bee3a3,1bea71f..2ab2f30
--- 1/update.php
--- 2/update.php
+++ b/update.php
@@@ -1371,17 -1371,18 +1371,44 @@@ ADD INDEX ( `datasize` ) ")
  }
  
  function update_1157() {
++<<<<<<< HEAD
 +      $r = q("ALTER TABLE `term` ADD `aid` int(10) unsigned NOT NULL DEFAULT '0',
 +              ADD `uid` int(10) unsigned NOT NULL DEFAULT '0',
 +              ADD INDEX (`uid`),
 +              ADD INDEX (`aid`)");
 +
 +      if(!$r) return UPDATE_FAILED;
 +      return UPDATE_SUCCESS;
 +}
 +function update_1158() {
+       $r = q("CREATE TABLE  IF NOT EXISTS `dsprphotoq` (
+         `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+         `uid` int(11) NOT NULL,
+         `msg` mediumtext NOT NULL,
+         `attempt` tinyint(4) NOT NULL,
+         PRIMARY KEY (`id`)
+         ) ENGINE=MyISAM DEFAULT CHARSET=utf8"
+       );
+ 
+       if($r)
+               return UPDATE_SUCCESS;
+ 
+       return UPDATE_FAILED;
+ }
+ 
++function update_1159() {
++      $r = q("ALTER TABLE `term` ADD `aid` int(10) unsigned NOT NULL DEFAULT '0',
++              ADD `uid` int(10) unsigned NOT NULL DEFAULT '0',
++              ADD INDEX (`uid`),
++              ADD INDEX (`aid`)");
++
++      if(!$r) return UPDATE_FAILED;
++      return UPDATE_SUCCESS;
++}
++
++function update_1160() {
 +      $r = q("ALTER TABLE `item` ADD `mention` TINYINT(1) NOT NULL DEFAULT '0', ADD INDEX (`mention`)");
 +// KEY `mention` (`mention`)
 +      if(!$r) return UPDATE_FAILED;
 +      return UPDATE_SUCCESS;
 +}