Merge remote-tracking branch 'dhruvgoel92/ticket/10703' into develop · upspace/phpbb3@0257cd1 · GitHub

upspace / phpbb3 Public

forked from phpbb/phpbb

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 0257cd1

Browse filesBrowse the repository at this point in the historyBrowse files

bantu

committed

Merge remote-tracking branch 'dhruvgoel92/ticket/10703' into develop

* dhruvgoel92/ticket/10703: [ticket/10703] Added a condition to check if ext directory exists

2 parents 0ce899c + 18c541d commit 0257cd1
Copy full SHA for 0257cd1

2 files changed

+11-1Lines changed: 11 additions & 1 deletion

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• phpBB
  • develop
    • extensions.php
  • includes/extension
    • manager.php

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎phpBB/develop/extensions.php‎

Copy file name to clipboardExpand all lines: phpBB/develop/extensions.php

+7-1Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -37,6 +37,13 @@ function list_extensions()
37	37	global $phpbb_extension_manager;
38	38
39	39	$phpbb_extension_manager->load_extensions();
	40	+ $all = array_keys($phpbb_extension_manager->all_available());
	41	+
	42	+ if (empty($all))
	43	+ {
	44	+ echo "There were no extensions found.\n";
	45	+ exit(3);
	46	+ }
40	47
41	48	echo "Enabled:\n";
42	49	$enabled = array_keys($phpbb_extension_manager->all_enabled());
@@ -49,7 +56,6 @@ function list_extensions()
49	56	echo "\n";
50	57
51	58	echo "Available:\n";
52		- $all = array_keys($phpbb_extension_manager->all_available());
53	59	$purged = array_diff($all, $enabled, $disabled);
54	60	print_extensions($purged);
55	61	}

Collapse file

‎phpBB/includes/extension/manager.php‎

Copy file name to clipboardExpand all lines: phpBB/includes/extension/manager.php

+4Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -352,6 +352,10 @@ public function purge($name)
352	352	public function all_available()
353	353	{
354	354	$available = array();
	355	+ if (!is_dir($this->phpbb_root_path . 'ext/'))
	356	+ {
	357	+ return $available;
	358	+ }
355	359
356	360	$iterator = new RecursiveIteratorIterator(
357	361	new RecursiveDirectoryIterator($this->phpbb_root_path . 'ext/'),

0 commit comments

Comments

0 (0)