Merge branch '1.10RC' into dev
This commit is contained in:
commit
8c2b93da72
@ -28,7 +28,7 @@ class Finger {
|
|||||||
|
|
||||||
if (strpos($webbie,'@') === false) {
|
if (strpos($webbie,'@') === false) {
|
||||||
$address = $webbie;
|
$address = $webbie;
|
||||||
$host = App::get_hostname();
|
$host = \App::get_hostname();
|
||||||
} else {
|
} else {
|
||||||
$address = substr($webbie,0,strpos($webbie,'@'));
|
$address = substr($webbie,0,strpos($webbie,'@'));
|
||||||
$host = substr($webbie,strpos($webbie,'@')+1);
|
$host = substr($webbie,strpos($webbie,'@')+1);
|
||||||
@ -127,4 +127,4 @@ class Finger {
|
|||||||
return $x;
|
return $x;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user