Changeset 2761 for trunk/bp-themes/bp-default/functions.php

Timestamp:

02/22/2010 01:25:56 PM (16 years ago)

Author:

apeatling

Message:

Merging 1.2 branch into trunk

File:

• trunk/bp-themes/bp-default/functions.php (modified) (3 diffs)

trunk/bp-themes/bp-default/functions.php

@@ -128 +128 @@
 /****
  * Custom header image support. You can remove this entirely in a child theme by adding this line
- * to your functions.php: remove_action( 'init', 'bp_dtheme_add_custom_header_support' );
+ * to your functions.php: define( 'BP_DTHEME_DISABLE_CUSTOM_HEADER', true );
  */
 function bp_dtheme_add_custom_header_support() {
@@ -200 +200 @@
     add_custom_image_header( 'bp_dtheme_header_style', 'bp_dtheme_admin_header_style' );
 }
-add_action( 'init', 'bp_dtheme_add_custom_header_support' );
+if ( !defined( 'BP_DTHEME_DISABLE_CUSTOM_HEADER' ) )
+    add_action( 'init', 'bp_dtheme_add_custom_header_support' );
 
 /* Show a notice when the theme is activated - workaround by Ozh (http://old.nabble.com/Activation-hook-exist-for-themes--td25211004.html) */
@@ -230 +231 @@
 add_action( 'wp_footer', 'bp_dtheme_js_terms' );
 
-//Google Maps Shortcode
-function fn_googleMaps($atts, $content = null) {
-    extract( shortcode_atts( array( "width" => '640', "height" => '480', "src" => '' ), $atts ) );
-    return '<iframe width="'.$width.'" height="'.$height.'" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="'.$src.'"></iframe>';
-}
-add_shortcode( "googlemap", "fn_googleMaps" );
-
 ?>