Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Rollback of Issue #2138239 by damiankloip, tim.plunkett, amateescu: Use GlobIterator instead of glob. — breaks testbot." 

Un-committing the un-commit of the previously committed commit. :P

This reverts commit 40e903f897.
8.0.x
webchick 2013-11-22 21:40:50 -08:00
parent 801db37f04
commit a4f033e217
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/lib/Drupal/Core/Config/FileStorage.php
View File

@ -204,11 +204,14 @@ class FileStorage implements StorageInterface {
throw new StorageException($this->directory . '/ not found.'); throw new StorageException($this->directory . '/ not found.');
} }
$extension = '.' . static::getFileExtension(); $extension = '.' . static::getFileExtension();
$files = glob($this->directory . '/' . $prefix . '*' . $extension); $files = new \GlobIterator(DRUPAL_ROOT . '/' . $this->directory . '/' . $prefix . '*' . $extension);
$clean_name = function ($value) use ($extension) {
return basename($value, $extension); $names = array();
}; foreach ($files as $file) {
return array_map($clean_name, $files); $names[] = $file->getBasename($extension);
}
return $names;
} }
/** /**

7
core/lib/Drupal/Core/Config/InstallStorage.php
View File

@ -134,10 +134,9 @@ class InstallStorage extends FileStorage {
foreach ($list as $name) { foreach ($list as $name) {
$directory = $this->getComponentFolder($type, $name); $directory = $this->getComponentFolder($type, $name);
if (file_exists($directory)) { if (file_exists($directory)) {
$files = glob($directory . '/*' . $extension); $files = new \GlobIterator(DRUPAL_ROOT . '/' . $directory . '/*' . $extension);
foreach ($files as $filename) { foreach ($files as $file) {
$name = basename($filename, $extension); $folders[$file->getBasename($extension)] = $directory;
$folders[$name] = $directory;
} }
} }
} }

6
core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php
View File

@ -320,9 +320,9 @@ class CKEditor extends EditorBase implements ContainerFactoryPluginInterface {
if (empty($langcodes)) { if (empty($langcodes)) {
$langcodes = array(); $langcodes = array();
// Collect languages included with CKEditor based on file listing. // Collect languages included with CKEditor based on file listing.
$ckeditor_languages = glob(DRUPAL_ROOT . '/core/assets/vendor/ckeditor/lang/*.js'); $ckeditor_languages = new \GlobIterator(DRUPAL_ROOT . '/core/assets/vendor/ckeditor/lang/*.js');
foreach ($ckeditor_languages as $language_filename) { foreach ($ckeditor_languages as $language_file) {
$langcode = basename($language_filename, '.js'); $langcode = $language_file->getBasename('.js');
$langcodes[$langcode] = $langcode; $langcodes[$langcode] = $langcode;
} }
cache('ckeditor.languages')->set('langcodes', $langcodes); cache('ckeditor.languages')->set('langcodes', $langcodes);