Changeset 23428


Ignore:
Timestamp:
2014/05/19 11:04:28 (6 years ago)
Author:
pineray
Message:

#2524 CSS の重複チェックができていないようです

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_13-dev/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php

    r23124 r23428  
    7676        $objFormParam->convParam(); 
    7777        $this->arrErr = $objFormParam->checkError(); 
    78         $is_error = (!SC_Utils_Ex::isBlank($this->arrErr)); 
     78        $is_error = !SC_Utils_Ex::isBlank($this->arrErr); 
    7979 
    8080        // CSSファイル名を取得 
    8181        $this->css_name = $objFormParam->getValue('css_name'); 
    82         $this->old_css_name = $objFormParam->getValue('old_css_name', $this->css_name); 
     82        $this->old_css_name = $objFormParam->getValue('old_css_name'); 
    8383        $this->device_type_id = $objFormParam->getValue('device_type_id', DEVICE_TYPE_PC); 
    8484 
     
    9090            case 'confirm': 
    9191                if (!$is_error) { 
    92                     $this->arrErr = $this->lfCheckError($objFormParam, $this->arrErr); 
     92                    $this->arrErr = array_merge($this->arrErr, $this->lfCheckError($objFormParam, $this->arrErr)); 
    9393                    if (SC_Utils_Ex::isBlank($this->arrErr)) { 
    9494                        if ($this->doRegister($css_dir, $this->css_name, $this->old_css_name, $css_path, 
     
    119119        } 
    120120 
    121         if (!$is_error && $this->checkPath($this->css_name)) { 
     121        if (SC_Utils_Ex::isBlank($this->arrErr) && $this->checkPath($this->css_name)) { 
    122122            // CSSファイルの読み込み 
    123123            if (!SC_Utils_Ex::isBlank($this->css_name)) { 
     
    234234 
    235235        $css_name = $objFormParam->getValue('css_name'); 
    236         $old_css_name = $objFormParam->getValue('old_css_name', $css_name); 
     236        $old_css_name = $objFormParam->getValue('old_css_name'); 
     237        $device_type_id = $objFormParam->getValue('device_type_id', DEVICE_TYPE_PC); 
    237238 
    238239        $is_error = false; 
    239240        // 重複チェック 
    240         if (!SC_Utils_Ex::isBlank(($objErr->arrErr['css_name']))) { 
    241             $arrCSSList = $this->getCSSList($this->getCSSDir()); 
     241        if (SC_Utils_Ex::isBlank($objErr->arrErr['css_name'])) { 
     242            $arrCSSList = $this->getCSSList($this->getCSSDir($device_type_id)); 
    242243            foreach ($arrCSSList as $val) { 
    243244                if ($val['css_name'] == $css_name) { 
Note: See TracChangeset for help on using the changeset viewer.