fernando/luos
1
0
Fork 0
Code Releases Activity

PM-4428

Browse Source
This commit is contained in:
Paula V. Quispe
2015-12-11 12:40:55 -04:00
parent 98e9397229
commit 84444cc00a
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework/src/Maveriks/Util/Common.php
View File

@@ -54,8 +54,10 @@ class Common
$files = glob("$path/$singlePattern", $flags);
$dirs = glob("$path/*", GLOB_MARK|GLOB_ONLYDIR|GLOB_NOSORT);
foreach ($dirs as $dir) {
$files = array_merge($files, self::rglob("$dir/$singlePattern", $flags));
if(is_array($dirs)){
foreach ($dirs as $dir) {
$files = array_merge($files, self::rglob("$dir/$singlePattern", $flags));
}
}
if ($onlyFiles) {

10
gulliver/system/class.g.php
View File

@@ -4910,10 +4910,14 @@ class G
$list = glob( rtrim( $path, DIRECTORY_SEPARATOR ) . DIRECTORY_SEPARATOR . '*' );
$sw = true;
foreach ($list as $f) {
if (! G::is_writable_r( $f, $noWritableFiles )) {
$sw = false;
if(is_array($list)){
foreach ($list as $f) {
if (! G::is_writable_r( $f, $noWritableFiles )) {
$sw = false;
}
}
} else {
$sw = false;
}
return $sw;

8
workflow/engine/classes/model/Translation.php
View File

@@ -476,9 +476,11 @@ class Translation extends BaseTranslation
$this->addTranslationEnvironment( $params['LOCALE'], $params['HEADERS'], $params['COUNT'] );
//getting more language translations
$files = glob( $translationsPath . "*.po" );
foreach ($files as $file) {
$params = self::getInfoFromPOFile( $file );
$this->addTranslationEnvironment( $params['LOCALE'], $params['HEADERS'], $params['COUNT'] );
if(is_array($files)){
foreach ($files as $file) {
$params = self::getInfoFromPOFile( $file );
$this->addTranslationEnvironment( $params['LOCALE'], $params['HEADERS'], $params['COUNT'] );
}
}
}
$envs = unserialize( file_get_contents( $filePath ) );