キャラクター選択でプロフない時のバグ修正

diff --git a/app/controllers/characters_controller.php b/app/controllers/characters_controller.php
index ad5ed55..3aeef4f 100644 (file)
--- a/app/controllers/characters_controller.php
+++ b/app/controllers/characters_controller.php
@@ -859,9 +859,8 @@ class CharactersController extends AppController {
                        $system_id = 0;
                }
                $systems = $this->_get_systems('public');
-               $systems = array_merge(array(
-                       '0' => __('All', true),
-               ), $systems);
+               $systems =
+                       array(0 => __('All', true)) + $systems;
 
                $this->search_cols['Character'] = array_merge($this->search_cols['Character'], array(
                        'system_id' => array(
@@ -1043,9 +1042,9 @@ class CharactersController extends AppController {
                        if (empty($isAdmin)) {
                                if (!empty($new_condition)) {
                                        $new_condition = '('. $new_condition. ')';
-                                       $new_condition .= ' AND';
                                }
                                if (isset($conditions['profile_search'])) {
+                                       $new_condition .= ' AND';
                                        $new_condition .= ' CharactersHasProfile.public_flag = \'public\'';
                                }
                        }