summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwebchick2012-11-01 23:41:10 -0700
committerwebchick2012-11-01 23:41:10 -0700
commit7bd2274ba4f7e4eff006b0c5ac661128b88ac89f (patch)
treead4e3d4c87c94588515680ef2f00b585f1eec2f9
parent3c698fb736cef22c56894d372c972e00b0eddfdc (diff)
Issue #1811372 by sdboyer: Fixed FileStorage should utilize late static binding for inheritance friendliness.
-rw-r--r--core/lib/Drupal/Core/Config/FileStorage.php4
-rw-r--r--core/lib/Drupal/Core/Config/InstallStorage.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/core/lib/Drupal/Core/Config/FileStorage.php b/core/lib/Drupal/Core/Config/FileStorage.php
index 78a1af6..1e22fdc 100644
--- a/core/lib/Drupal/Core/Config/FileStorage.php
+++ b/core/lib/Drupal/Core/Config/FileStorage.php
@@ -53,7 +53,7 @@ class FileStorage implements StorageInterface {
* The path to the configuration file.
*/
public function getFilePath($name) {
- return $this->directory . '/' . $name . '.' . self::getFileExtension();
+ return $this->directory . '/' . $name . '.' . static::getFileExtension();
}
/**
@@ -189,7 +189,7 @@ class FileStorage implements StorageInterface {
if (!file_exists($this->directory)) {
throw new StorageException($this->directory . '/ not found.');
}
- $extension = '.' . self::getFileExtension();
+ $extension = '.' . static::getFileExtension();
$files = glob($this->directory . '/' . $prefix . '*' . $extension);
$clean_name = function ($value) use ($extension) {
return basename($value, $extension);
diff --git a/core/lib/Drupal/Core/Config/InstallStorage.php b/core/lib/Drupal/Core/Config/InstallStorage.php
index f232f63..eceef01 100644
--- a/core/lib/Drupal/Core/Config/InstallStorage.php
+++ b/core/lib/Drupal/Core/Config/InstallStorage.php
@@ -44,7 +44,7 @@ class InstallStorage extends FileStorage {
$path = FALSE;
foreach (array('profile', 'module', 'theme') as $type) {
if ($path = drupal_get_path($type, $owner)) {
- $file = $path . '/config/' . $name . '.' . self::getFileExtension();
+ $file = $path . '/config/' . $name . '.' . static::getFileExtension();
if (file_exists($file)) {
return $file;
}