Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
14336d94
Commit
14336d94
authored
Nov 18, 2013
by
Alex Pott
Browse files
Issue
#2138239
by damiankloip: Use GlobIterator instead of glob.
parent
13ebcd22
Changes
3
Hide whitespace changes
Inline
Side-by-side
core/lib/Drupal/Core/Config/FileStorage.php
View file @
14336d94
...
...
@@ -204,11 +204,14 @@ public function listAll($prefix = '') {
throw
new
StorageException
(
$this
->
directory
.
'/ not found.'
);
}
$extension
=
'.'
.
static
::
getFileExtension
();
$files
=
glob
(
$this
->
directory
.
'/'
.
$prefix
.
'*'
.
$extension
);
$clean_name
=
function
(
$value
)
use
(
$extension
)
{
return
basename
(
$value
,
$extension
);
};
return
array_map
(
$clean_name
,
$files
);
$files
=
new
\
GlobIterator
(
$this
->
directory
.
'/'
.
$prefix
.
'*'
.
$extension
);
$names
=
array
();
foreach
(
$files
as
$file
)
{
$names
[]
=
$file
->
getBasename
(
$extension
);
}
return
$names
;
}
/**
...
...
core/lib/Drupal/Core/Config/InstallStorage.php
View file @
14336d94
...
...
@@ -134,10 +134,9 @@ public function getComponentNames($type, array $list) {
foreach
(
$list
as
$name
)
{
$directory
=
$this
->
getComponentFolder
(
$type
,
$name
);
if
(
file_exists
(
$directory
))
{
$files
=
glob
(
$directory
.
'/*'
.
$extension
);
foreach
(
$files
as
$filename
)
{
$name
=
basename
(
$filename
,
$extension
);
$folders
[
$name
]
=
$directory
;
$files
=
new
\
GlobIterator
(
$directory
.
'/*'
.
$extension
);
foreach
(
$files
as
$file
)
{
$folders
[
$file
->
getBasename
(
$extension
)]
=
$directory
;
}
}
}
...
...
core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php
View file @
14336d94
...
...
@@ -320,9 +320,9 @@ public function getLangcodes() {
if
(
empty
(
$langcodes
))
{
$langcodes
=
array
();
// Collect languages included with CKEditor based on file listing.
$ckeditor_languages
=
glob
(
DRUPAL_ROOT
.
'/core/assets/vendor/ckeditor/lang/*.js'
);
foreach
(
$ckeditor_languages
as
$language_file
name
)
{
$langcode
=
basename
(
$language_filename
,
'.js'
);
$ckeditor_languages
=
new
\
GlobIterator
(
DRUPAL_ROOT
.
'/core/assets/vendor/ckeditor/lang/*.js'
);
foreach
(
$ckeditor_languages
as
$language_file
)
{
$langcode
=
$language_file
->
getBase
name
(
'.js'
);
$langcodes
[
$langcode
]
=
$langcode
;
}
cache
(
'ckeditor.languages'
)
->
set
(
'langcodes'
,
$langcodes
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment