Changeset 3614

Timestamp:

12/30/2010 03:57:44 PM (14 years ago)

Author:

boonebgorges

Message:

Replaces sprintf double quotes with single quotes to avoid substitution problems. Fixes #2983

Location:

trunk

Files:

• bp-core/bp-core-filters.php (modified) (1 diff)
• bp-core/bp-core-signup.php (modified) (1 diff)
• bp-friends/bp-friends-notifications.php (modified) (1 diff)
• bp-themes/bp-default/functions.php (modified) (1 diff)

trunk/bp-core/bp-core-filters.php

@@ -231 +231 @@
     $from_name = ( '' == get_site_option( "site_name" ) ) ? 'WordPress' : esc_html( get_site_option( "site_name" ) );
     $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
-    $message = sprintf( __( "Thanks for registering! To complete the activation of your account please click the following link:\n\n%s\n\n", 'buddypress' ), $activate_url . $email, esc_url( "http://{$domain}{$path}" ) );
+    $message = sprintf( __( 'Thanks for registering! To complete the activation of your account please click the following link:\n\n%s\n\n', 'buddypress' ), $activate_url . $email, esc_url( "http://{$domain}{$path}" ) );
     $subject = '[' . $from_name . '] ' . __( 'Activate Your Account', 'buddypress' );
 

trunk/bp-core/bp-core-signup.php

@@ -626 +626 @@
     $from_name = ( '' == get_option( 'blogname' ) ) ? 'BuddyPress' : esc_html( get_option( 'blogname' ) );
     $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option( 'blog_charset' ) . "\"\n";
-    $message = sprintf( __( "Thanks for registering! To complete the activation of your account please click the following link:\n\n%s\n\n", 'buddypress' ), $activate_url );
+    $message = sprintf( __( 'Thanks for registering! To complete the activation of your account please click the following link:\n\n%s\n\n', 'buddypress' ), $activate_url );
     $subject = '[' . $from_name . '] ' . __( 'Activate Your Account', 'buddypress' );
 

trunk/bp-friends/bp-friends-notifications.php

@@ -23 +23 @@
 
     $message = sprintf( __(
-"%1$s wants to add you as a friend.
+'%1$s wants to add you as a friend.
 
 To view all of your pending friendship requests: %2$s
 
-To view %3$s's profile: %4$s
+To view %3$s\'s profile: %4$s
 
 ---------------------
-", 'buddypress' ), $initiator_name, $all_requests_link, $initiator_name, $initiator_link );
+', 'buddypress' ), $initiator_name, $all_requests_link, $initiator_name, $initiator_link );
 
     $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
-
+    
     /* Send the message */
     $to = apply_filters( 'friends_notification_new_request_to', $to );

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

@@ -132 +132 @@
 
     if ( !empty( $bp->displayed_user->id ) )
-        $params['mention_explain'] = sprintf( __( "%s is a unique identifier for %s that you can type into any message on this site. %s will be sent a notification and a link to your message any time you use it.", 'buddypress' ), '@' . bp_get_displayed_user_username(), bp_get_user_firstname( bp_get_displayed_user_fullname() ), bp_get_user_firstname( bp_get_displayed_user_fullname() ) );
+        $params['mention_explain'] = sprintf( __( '%s is a unique identifier for %s that you can type into any message on this site. %s will be sent a notification and a link to your message any time you use it.', 'buddypress' ), '@' . bp_get_displayed_user_username(), bp_get_user_firstname( bp_get_displayed_user_fullname() ), bp_get_user_firstname( bp_get_displayed_user_fullname() ) );
 
     wp_localize_script( 'dtheme-ajax-js', 'BP_DTheme', $params );