aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2014-06-24 00:39:40 +0200
committerAndreas Fischer <bantu@phpbb.com>2014-06-24 00:39:40 +0200
commit05bcce31690fad727f418af7501aa2ae07c06c93 (patch)
tree8e880736988ea986be299fbe8b517f19fdc2b358 /phpBB
parentba456bb00ea161ff17311689cdc4bcc8657bb32d (diff)
parent26eb15ffabc4616ac97e016b2226a7a7a2323dac (diff)
downloadforums-05bcce31690fad727f418af7501aa2ae07c06c93.tar
forums-05bcce31690fad727f418af7501aa2ae07c06c93.tar.gz
forums-05bcce31690fad727f418af7501aa2ae07c06c93.tar.bz2
forums-05bcce31690fad727f418af7501aa2ae07c06c93.tar.xz
forums-05bcce31690fad727f418af7501aa2ae07c06c93.zip
Merge pull request #2642 from Nicofuma/ticket/12762
[ticket/12762] Make ext.php optional for extensions * Nicofuma/ticket/12762: [ticket/12762] Make ext.php optional for extensions
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/phpbb/extension/manager.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/extension/manager.php b/phpBB/phpbb/extension/manager.php
index 52d9395c82..4130e8455a 100644
--- a/phpBB/phpbb/extension/manager.php
+++ b/phpBB/phpbb/extension/manager.php
@@ -423,7 +423,7 @@ class manager
foreach ($iterator as $file_info)
{
- if ($file_info->isFile() && $file_info->getFilename() == 'ext.' . $this->php_ext)
+ if ($file_info->isFile() && $file_info->getFilename() == 'composer.json')
{
$ext_name = $iterator->getInnerIterator()->getSubPath();
$composer_file = $iterator->getPath() . '/composer.json';