Merge pull request #122 from Automattic/photon-bp

Jetpack: Photon: Prevent avatars from loading from Photon on avatar chan...
Automattic · Jan 23, 2014 · d8f003f · d8f003f
2 parents 7b63b6b + e2800d0
commit d8f003f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/3rd-party/3rd-party.php b/3rd-party/3rd-party.php
@@ -0,0 +1,8 @@
+<?php
+
+/*
+ * Placeholder to load 3rd party plugin tweaks until a legit system
+ * is architected
+ */
+
+require_once( 'buddypress.php' );
diff --git a/3rd-party/buddypress.php b/3rd-party/buddypress.php
@@ -0,0 +1,9 @@
+<?php
+
+add_filter( 'bp_core_pre_avatar_handle_upload', 'blobphoto' );
+function blobphoto( $bool ) {
+
+	add_filter( 'jetpack_photon_skip_image', '__return_true' );
+
+	return $bool;
+}
diff --git a/jetpack.php b/jetpack.php
@@ -81,3 +81,5 @@
 	Jetpack_Sync::sync_options( __FILE__, 'db_version', 'jetpack_active_modules', 'active_plugins' );
 }
 */
+
+require_once( JETPACK__PLUGIN_DIR . '3rd-party/3rd-party.php' );
-Original file line number
+Diff line change
@@ Expand Up / @@ -81,3 +81,5 @@ @@
     	Jetpack_Sync::sync_options( __FILE__, 'db_version', 'jetpack_active_modules', 'active_plugins' );
     }
     */
+    require_once( JETPACK__PLUGIN_DIR . '3rd-party/3rd-party.php' );