Merge branch 'master' of git.076.ne.jp:communities/current/076server into dev-master
このコミットが含まれているのは:
コミット
474132040e
|
@ -26,7 +26,7 @@ class NihonController extends Controller {
|
|||
}
|
||||
|
||||
public function getGeoPrefecture () {
|
||||
$get = DB::table('nhn_prefecture')->get();
|
||||
$get = DB::table('nhn_prefecture')->get()->toArray();
|
||||
|
||||
foreach ($get as $g) {
|
||||
$r = DB::table('nhn_region')->where('id', $g->region_id)->first();
|
||||
|
@ -40,6 +40,16 @@ class NihonController extends Controller {
|
|||
unset($g->region_id); unset($r->island_id);
|
||||
}
|
||||
|
||||
array_unshift($get, array(
|
||||
'id' => 0,
|
||||
'name' => '',
|
||||
'nameKana' => '',
|
||||
'nameEng' => '',
|
||||
'prefcode' => '',
|
||||
'region' => array('name' => '', 'nameKana' => '', 'nameEng' => ''),
|
||||
'island' => array('name' => '', 'nameKana' => '', 'nameEng' => '')
|
||||
));
|
||||
|
||||
return $get;
|
||||
}
|
||||
|
||||
|
|
新しいイシューから参照