Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
anklimsk committed Nov 30, 2019
2 parents c333bf6 + 2543276 commit 9be39ac
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 16 deletions.
20 changes: 10 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
language: php

php:
- 5.6
- 7.1
- 7.3

cache:
directories:
Expand All @@ -14,34 +13,35 @@ env:
- REQUIRE="anklimsk/cakephp-console-installer dereuromark/cakephp-queue:^2.3.0"
- DB=mysql
- CAKE_REF=2.x
- PHPUNIT=5.7.19

services:
- mysql

matrix:
include:
- php: 7.1
- php: 7.3
env:
- CODECOVERAGE=1
- php: 7.1
- php: 7.3
env:
- PHPCS=1
- PHPCS_IGNORE=CakeInstaller,CakeBasicFunctions,CakeExtendTest,CakeConfigPlugin,CakeTheme,AssetCompress,Bs3Helpers,Queue,Shim,Tools
- php: 7.1
- php: 7.3
env:
- FOC_VALIDATE=1

before_script:
- git clone -b master https://github.com/FriendsOfCake/travis.git --depth 1 ../travis
- git clone -b master https://github.com/anklimsk/travis.git --depth 1 ../travis
- travis_wait ../travis/before_script.sh
- if [ -f "../cakephp/app/Console/cake" ]; then ../cakephp/app/Console/cake CakeInstaller setsecurkey --yes --app $(cd ../cakephp/app; pwd); fi
- if [ -f "../cakephp/app/Config/database.php" ]; then sed -i -r "/$test = array\(/a 'encoding' => 'utf8'," ../cakephp/app/Config/database.php; fi
- if [ -f "../cakephp/app/Plugin/CakeTheme/Config/asset_compress.local.ini" ]; then cp "../cakephp/app/Plugin/CakeTheme/Config/asset_compress.local.ini" "../cakephp/app/Config/asset_compress.ini"; fi

script:
- ../travis/script.sh

after_success:
- if [ -f "../cakephp/app/clover.xml" ]; then cp ../cakephp/app/clover.xml ../cakephp/app/Plugin/$PLUGIN_NAME; fi
- if [ -d "../cakephp/app/Plugin/$PLUGIN_NAME" ]; then cd ../cakephp/app/Plugin/$PLUGIN_NAME; fi
- if [ "$CODECOVERAGE" == '1' ]; then wget -O codecov.sh https://codecov.io/bash; bash codecov.sh; fi
- ../travis/after_success.sh

notifications:
email: false
2 changes: 1 addition & 1 deletion Model/SettingBase.php
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ public function save($data = null, $validate = true, $fieldList = []) {
break;
default:
if (mb_strpos($configName, '_confirm') !== false) {
continue;
continue 2;
}
if (in_array($configName, $listSerializedFields)) {
$configValue = serialize($configValue);
Expand Down
6 changes: 1 addition & 5 deletions View/Settings/index.ctp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* interface of settings application.
*
* CakeSettingsApp: Manage settings of application.
* @copyright Copyright 2016-2018, Andrey Klimov.
* @copyright Copyright 2016-2019, Andrey Klimov.
* @license https://opensource.org/licenses/mit-license.php MIT License
* @package plugin.View.Settings
*/
Expand All @@ -19,17 +19,13 @@
<?php
echo $this->ViewExtension->headerPage($pageHeader);
echo $this->element('CakeSettingsApp.formSettings', compact(
'errors',
'countryCode',
'groupList',
'configUIlangs',
'configSMTP',
'configAcLimit',
'configADsearch',
'configExtAuth',
'authGroups',
'UIlang',
'UIlangs',
'varsExt'
));
?>
Expand Down

0 comments on commit 9be39ac

Please sign in to comment.