Compare commits
2 commits
ed1b6b7e77
...
2a7929719b
Author | SHA1 | Date | |
---|---|---|---|
2a7929719b | |||
369b32bc93 |
1 changed files with 4 additions and 0 deletions
|
@ -137,7 +137,11 @@ class Transformers_Manager {
|
||||||
*
|
*
|
||||||
* @return bool True if the ActivityPub transformer was registered.
|
* @return bool True if the ActivityPub transformer was registered.
|
||||||
*/
|
*/
|
||||||
|
<<<<<<< HEAD
|
||||||
public function register( \ActivityPub\Transformer\Base $transformer_instance) {
|
public function register( \ActivityPub\Transformer\Base $transformer_instance) {
|
||||||
|
=======
|
||||||
|
public function register( \ActivityPub\Transformer\Base $transformer_instance ) {
|
||||||
|
>>>>>>> ed1b6b7e77ed12f77fb1a9b4bf9f959509b55bf9
|
||||||
|
|
||||||
if ( ! $transformer_instance instanceof \ActivityPub\Transformer\Base ) {
|
if ( ! $transformer_instance instanceof \ActivityPub\Transformer\Base ) {
|
||||||
_doing_it_wrong(
|
_doing_it_wrong(
|
||||||
|
|
Loading…
Reference in a new issue