Merge branch '2018.08-rc'

[friendica.git/.git] / boot.php

diff --git a/boot.php b/boot.php
index 9b18361..2236a4d 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -39,9 +39,9 @@ require_once 'include/text.php';
 
 define('FRIENDICA_PLATFORM',     'Friendica');
 define('FRIENDICA_CODENAME',     'The Tazmans Flax-lily');
-define('FRIENDICA_VERSION',      '2018.08-dev');
+define('FRIENDICA_VERSION',      '2018.08-rc');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
-define('DB_UPDATE_VERSION',      1282);
+define('DB_UPDATE_VERSION',      1283);
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 
 /**
@@ -883,13 +883,9 @@ function feed_birthday($uid, $tz)
                $tz = 'UTC';
        }
 
-       $p = q(
-               "SELECT `dob` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
-               intval($uid)
-       );
-
-       if (DBA::isResult($p)) {
-               $tmp_dob = substr($p[0]['dob'], 5);
+       $profile = DBA::selectFirst('profile', ['dob'], ['is-default' => true, 'uid' => $uid]);
+       if (DBA::isResult($profile)) {
+               $tmp_dob = substr($profile['dob'], 5);
                if (intval($tmp_dob)) {
                        $y = DateTimeFormat::timezoneNow($tz, 'Y');
                        $bd = $y . '-' . $tmp_dob . ' 00:00';