Skip to content

Commit

Permalink
Merge pull request #862 from WordPress/861-allow-isc-license-plugin-h…
Browse files Browse the repository at this point in the history
…eader

Allow ISC license in Plugin Header
  • Loading branch information
ernilambar authored Jan 27, 2025
2 parents a1ecb29 + f2e26a5 commit f8d1e71
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion includes/Traits/License_Utils.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ protected function is_license_valid_identifier( $license ) {
* @return bool true if the license is GPL compatible, otherwise false.
*/
protected function is_license_gpl_compatible( $license ) {
$match = preg_match( '/GPL|GNU|MIT|FreeBSD|New BSD|BSD-3-Clause|BSD 3 Clause|OpenLDAP|Expat|Apache|MPL20/im', $license );
$match = preg_match( '/GPL|GNU|MIT|FreeBSD|New BSD|BSD-3-Clause|BSD 3 Clause|OpenLDAP|Expat|Apache|MPL20|ISC/im', $license );

return ( false === $match || 0 === $match ) ? false : true;
}
Expand Down
1 change: 1 addition & 0 deletions tests/phpunit/tests/Traits/License_Utils_Tests.php
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ public function data_license_gpl_compatibility() {
array( 'BSD 3 Clause', true ),
array( 'OpenLDAP', true ),
array( 'Expat', true ),
array( 'ISC', true ),

array( 'EPL', false ),
array( 'EUPL', false ),
Expand Down

0 comments on commit f8d1e71

Please sign in to comment.