Merge pull request #6483 from MrPetovan/bug/fixes-after-2019-03-develop-rebase

Fixes after 2019 03 develop rebase

diff --git a/VERSION b/VERSION
index ca54cd8e0c4df5d1cc27d653489e00830caec9d3..2b5b640bc39a5167bfdf5e5cc7b609d766d43054 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2019.01
+2019.03-dev

diff --git a/boot.php b/boot.php
index 7b4c72f19c80724e93c1700c04b41c6aa44e317e..1766e801edfcf8640baab7a72ea1d204aca7eff1 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -35,7 +35,7 @@ use Friendica\Util\DateTimeFormat;
 
 define('FRIENDICA_PLATFORM',     'Friendica');
 define('FRIENDICA_CODENAME',     'The Tazmans Flax-lily');
-define('FRIENDICA_VERSION',      '2019.01');
+define('FRIENDICA_VERSION',      '2019.03-dev');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 8beffb483c17a69d3619047eb6b684a6b95b2b13..59f2627e33032426cbe1f1b84cdbae5e418732eb 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -198,7 +198,7 @@ class Contact extends BaseModule
 
                $profile_id = intval(defaults($_POST, 'profile-assign', 0));
                if ($profile_id) {
-                       if (!DBA::exists('profile', ['id' => $profile_id, 'uid' => local_user(), 'deleted' => false])) {
+                       if (!DBA::exists('profile', ['id' => $profile_id, 'uid' => local_user()])) {
                                notice(L10n::t('Could not locate selected profile.') . EOL);
                                return;
                        }