Merge remote-tracking branch 'upstream/develop' into develop

Also removed <<<<< as this interfers (a bit) with searching for merge conflicts
with a more simplier editor.

Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
	mod/ping.php
	view/lang/fr/messages.po
	view/lang/fr/strings.php

diff --cc library/langdet/Text/LanguageDetect.php
index d3caaff39023107a6e9951449190c02bc8159fd7,d3caaff39023107a6e9951449190c02bc8159fd7..45337ea8fca6054206f3b7851a989e474fe0f981
--- 1/library/langdet/Text/LanguageDetect.php
--- 2/library/langdet/Text/LanguageDetect.php
+++ b/library/langdet/Text/LanguageDetect.php
@@@ -396,7 -396,7 +396,7 @@@ class Text_LanguageDetec
       * Returns the list of detectable languages
       *
       * @access public
--     * @return array        the names of the languages known to this object<<<<<<<
++     * @return array        the names of the languages known to this object
       * @throws   Text_LanguageDetect_Exception
       */
      function getLanguages()

diff --cc mod/ping.php
index 3f6dc730b20423a82da7235d260e092d03ff76f6,7e20b9383d6788cb68bf8c6a08c060a87ee46f36..1bbddbe5c359666889388f5f64b3506e183f9de6
--- 1/mod/ping.php
--- 2/mod/ping.php
+++ b/mod/ping.php
@@@ -111,33 -174,27 +174,30 @@@ function ping_init(App $a
                        intval(local_user())
                );
  
-               $intro = count($intros1) + count($intros2);
-               $intros = $intros1+$intros2;
+               $intro_count = count($intros1) + count($intros2);
 -              $intros = $intros1+$intros2;
++              $intros = $intros1 + $intros2;
  
                $myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ;
-               $mails = q("SELECT * FROM `mail`
+               $mails = qu("SELECT `id`, `from-name`, `from-url`, `from-photo`, `created` FROM `mail`
                        WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
                        intval(local_user()),
                        dbesc($myurl)
                );
-               $mail = count($mails);
+               $mail_count = count($mails);
  
                if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()){
-                       $regs = q("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created` FROM `contact` RIGHT JOIN `register` ON `register`.`uid`=`contact`.`uid` WHERE `contact`.`self`=1");
-                       $register = count($regs);
-               } else {
-                       $register = 0;
-               }
+                       $regs = qu("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) AS `total`
+                               FROM `contact` RIGHT JOIN `register` ON `register`.`uid` = `contact`.`uid`
+                               WHERE `contact`.`self` = 1");
 -                      if ($regs) {
 +
-               $all_events = 0;
-               $all_events_today = 0;
-               $events = 0;
-               $events_today = 0;
-               $birthdays = 0;
-               $birthdays_today = 0;
++                      $register_count = 0;
 +
++                      if (dbm::is_result($regs)) {
+                               $register_count = $regs[0]['total'];
+                       }
+               }
  
-               $ev = q("SELECT count(`event`.`id`) as total, type, start, adjust FROM `event`
+               $ev = qu("SELECT count(`event`.`id`) AS total, type, start, adjust FROM `event`
                        WHERE `event`.`uid` = %d AND `start` < '%s' AND `finish` > '%s' and `ignore` = 0
                        ORDER BY `start` ASC ",
                        intval(local_user()),