Merge pull request #3868 from rabuzarus/20171104_-_use_best_link_url_for_events

[friendica.git] / include / update_gcontact.php

diff --git a/include/update_gcontact.php b/include/update_gcontact.php
index d283bd268931093d08ad4237b6fb0051257f99f9..97c825352eb26919930ea92c99727077875389d9 100644 (file)
--- a/include/update_gcontact.php
+++ b/include/update_gcontact.php
@@ -40,16 +40,16 @@ function update_gcontact_run(&$argv, &$argc) {
                return;
        }
 
-       if (($data["name"] == "") AND ($r[0]['name'] != ""))
+       if (($data["name"] == "") && ($r[0]['name'] != ""))
                $data["name"] = $r[0]['name'];
 
-       if (($data["nick"] == "") AND ($r[0]['nick'] != ""))
+       if (($data["nick"] == "") && ($r[0]['nick'] != ""))
                $data["nick"] = $r[0]['nick'];
 
-       if (($data["addr"] == "") AND ($r[0]['addr'] != ""))
+       if (($data["addr"] == "") && ($r[0]['addr'] != ""))
                $data["addr"] = $r[0]['addr'];
 
-       if (($data["photo"] == "") AND ($r[0]['photo'] != ""))
+       if (($data["photo"] == "") && ($r[0]['photo'] != ""))
                $data["photo"] = $r[0]['photo'];