Merge branch 'add/extendable-transformers' of ssh://code.event-federation.eu:2222/Event-Federation/wordpress-activitypub into add/extendable-transformers

transformer: move all related code to \Activitypub\Transformer namespace
2023-11-25 10:24:45 +01:00 · 2023-11-22 08:36:55 +01:00
1 changed files with 4 additions and 0 deletions
--- a/includes/transformer/class-transformers-manager.php
+++ b/includes/transformer/class-transformers-manager.php
@ -137,7 +137,11 @@ class Transformers_Manager {
 	 *
 	 * @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 ) {
+>>>>>>> ed1b6b7e77ed12f77fb1a9b4bf9f959509b55bf9

 		if ( ! $transformer_instance instanceof \ActivityPub\Transformer\Base ) {
 			_doing_it_wrong(
Author	SHA1	Message	Date
André Menrath	2a7929719b	Merge branch 'add/extendable-transformers' of ssh://code.event-federation.eu:2222/Event-Federation/wordpress-activitypub into add/extendable-transformers	2023-11-25 10:24:45 +01:00
André Menrath	369b32bc93	transformer: move all related code to \Activitypub\Transformer namespace	2023-11-22 08:36:55 +01:00