All ResourceLoaderFileModule subclasses are now required to support
the 'skinStyles' property in their module definition, and ideally
make use of it (but at least they must not fail violently).
Follow-up to
51eede02837a3a9d378cb35fa7c27a9f4e8e5f4e.
Bug: T167478
Bug: T168088
Change-Id: I35a12a451bf2695818702df1bbd1708173a3f9ce
- * Return whether the definition of a module corresponds to a simple ResourceLoaderFileModule.
+ * Return whether the definition of a module corresponds to a simple ResourceLoaderFileModule
+ * or one of its subclasses.
*
* @param string $name Module name
* @return bool
*
* @param string $name Module name
* @return bool
return false;
}
$info = $this->moduleInfos[$name];
return false;
}
$info = $this->moduleInfos[$name];
+ if ( isset( $info['object'] ) ) {
+ return false;
+ }
- isset( $info['object'] ) ||
- // This special case is dumb, but we need $wgResourceModuleSkinStyles
- // to work for 'oojs-ui-core.styles'. See T167042.
- ( isset( $info['class'] ) && $info['class'] !== 'ResourceLoaderOOUIFileModule' )
+ isset( $info['class'] ) &&
+ $info['class'] !== 'ResourceLoaderFileModule' &&
+ !is_subclass_of( $info['class'], 'ResourceLoaderFileModule' )