diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-03-25 23:58:56 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-03-25 23:58:56 +0200 |
| commit | 0257cd1653a37638477534c0cd78be20f0d58e2d (patch) | |
| tree | 4de1f89ac0719318bb796031abd59caae5a28fb7 | |
| parent | 0ce899cb8730008b470ef37eac3dcd2965fd2314 (diff) | |
| parent | 18c541dfee6ec7db0e04c939bc103cefe9dab9d7 (diff) | |
| download | forums-0257cd1653a37638477534c0cd78be20f0d58e2d.tar forums-0257cd1653a37638477534c0cd78be20f0d58e2d.tar.gz forums-0257cd1653a37638477534c0cd78be20f0d58e2d.tar.bz2 forums-0257cd1653a37638477534c0cd78be20f0d58e2d.tar.xz forums-0257cd1653a37638477534c0cd78be20f0d58e2d.zip | |
Merge remote-tracking branch 'dhruvgoel92/ticket/10703' into develop
* dhruvgoel92/ticket/10703:
[ticket/10703] Added a condition to check if ext directory exists
| -rw-r--r-- | phpBB/develop/extensions.php | 8 | ||||
| -rw-r--r-- | phpBB/includes/extension/manager.php | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/phpBB/develop/extensions.php b/phpBB/develop/extensions.php index 2f7c3d1167..43621f3080 100644 --- a/phpBB/develop/extensions.php +++ b/phpBB/develop/extensions.php @@ -37,6 +37,13 @@ function list_extensions() global $phpbb_extension_manager; $phpbb_extension_manager->load_extensions(); + $all = array_keys($phpbb_extension_manager->all_available()); + + if (empty($all)) + { + echo "There were no extensions found.\n"; + exit(3); + } echo "Enabled:\n"; $enabled = array_keys($phpbb_extension_manager->all_enabled()); @@ -49,7 +56,6 @@ function list_extensions() echo "\n"; echo "Available:\n"; - $all = array_keys($phpbb_extension_manager->all_available()); $purged = array_diff($all, $enabled, $disabled); print_extensions($purged); } diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php index c38f0df32e..dac0e5f947 100644 --- a/phpBB/includes/extension/manager.php +++ b/phpBB/includes/extension/manager.php @@ -352,6 +352,10 @@ class phpbb_extension_manager public function all_available() { $available = array(); + if (!is_dir($this->phpbb_root_path . 'ext/')) + { + return $available; + } $iterator = new RecursiveIteratorIterator( new RecursiveDirectoryIterator($this->phpbb_root_path . 'ext/'), |