aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Import.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-02-24 08:42:25 +0100
committerMario Vavti <mario@mariovavti.com>2018-02-24 08:42:25 +0100
commitf6d024cb3f2663cd1d61e5fc18546adb93b9a7db (patch)
treed4067d517bfa67c20e9bae0a41d3a882f419735d /Zotlabs/Module/Import.php
parent1c750dac4187c3872e29c79f0c0856ec8a29331e (diff)
parente6f9f284bf04f0dc0471fa08d7dac118effe4ccb (diff)
downloadvolse-hubzilla-f6d024cb3f2663cd1d61e5fc18546adb93b9a7db.tar.gz
volse-hubzilla-f6d024cb3f2663cd1d61e5fc18546adb93b9a7db.tar.bz2
volse-hubzilla-f6d024cb3f2663cd1d61e5fc18546adb93b9a7db.zip
Merge remote-tracking branch 'mike/master' into dev
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);
}