diff options
| author | Vjacheslav Trushkin <arty@phpbb.com> | 2012-03-29 22:38:07 +0300 |
|---|---|---|
| committer | Vjacheslav Trushkin <arty@phpbb.com> | 2012-03-29 22:38:07 +0300 |
| commit | ba431def5d951ca3df28a1f872d3fa05a9caad54 (patch) | |
| tree | 1425c92d5bc8fda8858ff9a2ab817a26ce901550 /phpBB/develop/extensions.php | |
| parent | d25b607ca16bfd240f3b9cb9da7e4567b426ec26 (diff) | |
| parent | ae824aef1255f7bd4da502fc1d9d0e85219ce32a (diff) | |
| download | forums-ba431def5d951ca3df28a1f872d3fa05a9caad54.tar forums-ba431def5d951ca3df28a1f872d3fa05a9caad54.tar.gz forums-ba431def5d951ca3df28a1f872d3fa05a9caad54.tar.bz2 forums-ba431def5d951ca3df28a1f872d3fa05a9caad54.tar.xz forums-ba431def5d951ca3df28a1f872d3fa05a9caad54.zip | |
Merge remote-tracking branch 'upstream/develop' into feature/merging-style-components
* upstream/develop: (65 commits)
[ticket/10730] Added label tag around "select" text in post splitting UI
[ticket/10732] Add config_dev.php and config_test.php to .gitignore
[ticket/10586] Added space in if statement
[ticket/10586] Tidy up comments
[task/php5.3] Updated range of tested PHP versions
[task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2
[task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2
[ticket/10723] Stop Travis running all tests on sqlite
[ticket/10703] Added a condition to check if ext directory exists
[task/travis] Refactor php version check for dbunit install
[task/travis] Exclude functional and slow tests
[ticket/10719] Revert "Skip functional tests on PHP 5.2"
[task/travis-develop2] Update version from 5.3 to 5.3.2
[task/travis] Dropping support for 5.2 in develop branch
[task/travis] Some more small travis fixes
[task/travis] Rename travis phpunit config files
[task/travis] Fixing some travis issues
[ticket/10684] Adjust function and parameter name, minor changes.
[task/travis] Add automated testing to readme
[task/travis] Removing development information
...
Conflicts:
phpBB/install/database_update.php
Diffstat (limited to 'phpBB/develop/extensions.php')
| -rw-r--r-- | phpBB/develop/extensions.php | 8 |
1 files changed, 7 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); } |