|
@@ -254,7 +254,7 @@ class Api
|
|
|
*
|
|
|
* @return mixed
|
|
|
*/
|
|
|
- public function string($area, $im = ',')
|
|
|
+ public function string($area, $im = ',', $unset = true)
|
|
|
{
|
|
|
if ($area) {
|
|
|
$area = explode(',', $area);
|
|
@@ -264,7 +264,7 @@ class Api
|
|
|
$result[$k] = $this->getName('province', $v);
|
|
|
} elseif ($k == 1) {
|
|
|
$result[$k] = $this->getName('city', $v);
|
|
|
- if ($result[0] == $result[1]) {
|
|
|
+ if ($result[0] == $result[1] && $unset) {
|
|
|
unset($result[1]);
|
|
|
}
|
|
|
} elseif ($k == 2) {
|