aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Import.php
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2018-02-24 06:48:56 -0500
committerAndrew Manning <tamanning@zoho.com>2018-02-24 06:48:56 -0500
commit497ebca54f5eaa74a1e9c9e4c5183c5565ce09e8 (patch)
tree784b6afd1e7b5f855dce8c4d1d703697cdac56e6 /Zotlabs/Module/Import.php
parent64ee42fc3d00765bc5c60e451b86230ea38ffdfb (diff)
parentf6d024cb3f2663cd1d61e5fc18546adb93b9a7db (diff)
downloadvolse-hubzilla-497ebca54f5eaa74a1e9c9e4c5183c5565ce09e8.tar.gz
volse-hubzilla-497ebca54f5eaa74a1e9c9e4c5183c5565ce09e8.tar.bz2
volse-hubzilla-497ebca54f5eaa74a1e9c9e4c5183c5565ce09e8.zip
Merge branch 'dev' into oauth2
Diffstat (limited to 'Zotlabs/Module/Import.php')
-rw-r--r--Zotlabs/Module/Import.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php
index 2b16ff4e1..36bd72310 100644
--- a/Zotlabs/Module/Import.php
+++ b/Zotlabs/Module/Import.php
@@ -64,7 +64,7 @@ class Import extends \Zotlabs\Web\Controller {
notice( t('Nothing to import.') . EOL);
return;
} else if(strpos($old_address, '@')) {
- // if you copy the identity address from your profile page, make it work for convenience
+ // if you copy the identity address from your profile page, make it work for convenience - WARNING: this is a utf-8 variant and NOT an ASCII ampersand. Please do not edit.
$old_address = str_replace('@', '@', $old_address);
}