rework autocomplete: update query-textcomplete

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 43f69fc1151ba26945a9fc5c4f4ec457b3cbc485..a9ff0c30c340d55e247610af6f70b3a6ff7ccf2f 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -927,7 +927,7 @@ class App {
                } else {
                        $r = q("SELECT `contact`.`avatar-date` AS picdate FROM `contact` WHERE `contact`.`thumb` like '%%/%s'",
                                $common_filename);
-                       if(! count($r)){
+                       if(! dba::is_result($r)){
                                $this->cached_profile_image[$avatar_image] = $avatar_image;
                        } else {
                                $this->cached_profile_picdate[$common_filename] = "?rev=".urlencode($r[0]['picdate']);
@@ -1412,7 +1412,7 @@ function run_update_function($x) {
 function check_plugins(&$a) {
 
        $r = q("SELECT * FROM `addon` WHERE `installed` = 1");
-       if(count($r))
+       if(dba::is_result($r))
                $installed = $r;
        else
                $installed = array();
@@ -1558,7 +1558,7 @@ function killme() {
  * @brief Redirect to another URL and terminate this process.
  */
 function goaway($s) {
-       if (!strstr(normalise_link($s), normalise_link(App::get_baseurl())))
+       if (!strstr(normalise_link($s), "http://"))
                $s = App::get_baseurl()."/".$s;
 
        header("Location: $s");
@@ -1743,7 +1743,7 @@ function current_theme(){
                $r = q("select theme from user where uid = %d limit 1",
                        intval($a->profile_uid)
                );
-               if($r)
+               if(dba::is_result($r))
                        $page_theme = $r[0]['theme'];
        }
 
@@ -1856,7 +1856,7 @@ function feed_birthday($uid,$tz) {
                        intval($uid)
        );
 
-       if($p && count($p)) {
+       if(dba::is_result($p)) {
                $tmp_dob = substr($p[0]['dob'],5);
                if(intval($tmp_dob)) {
                        $y = datetime_convert($tz,$tz,'now','Y');
@@ -1901,7 +1901,8 @@ function load_contact_links($uid) {
        $r = q("SELECT `id`,`network`,`url`,`thumb`, `rel` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `thumb` != ''",
                        intval($uid)
        );
-       if(count($r)) {
+
+       if(dba::is_result($r)) {
                foreach($r as $rr){
                        $url = normalise_link($rr['url']);
                        $ret[$url] = $rr;