Skip to content

Commit d47476f

Browse files
committed
indent with tabs, not spaces
1 parent a44742d commit d47476f

13 files changed

+1193
-1138
lines changed

facebook.php

+8-10
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,12 @@ function fb_load_textdomain() {
4242
register_uninstall_hook( __FILE__, 'fb_uninstall' );
4343

4444
function fb_uninstall() {
45-
46-
$meta_keys = array('state', 'code', 'access_token', 'user_id', 'fb_data');
47-
48-
foreach ( $meta_keys as $meta_key ) {
49-
delete_user_meta( get_current_user_id(), $meta_key );
50-
}
51-
52-
delete_option( 'fb_options' );
53-
delete_option( 'fb_flush_rewrite_rules' );
54-
}
45+
$meta_keys = array('state', 'code', 'access_token', 'user_id', 'fb_data');
46+
47+
foreach ( $meta_keys as $meta_key ) {
48+
delete_user_meta( get_current_user_id(), $meta_key );
49+
}
5550

51+
delete_option( 'fb_options' );
52+
delete_option( 'fb_flush_rewrite_rules' );
53+
}

fb-admin-menu.php

+203-206
Large diffs are not rendered by default.

fb-core.php

+16-17
Original file line numberDiff line numberDiff line change
@@ -49,27 +49,26 @@ function fb_ssl_warning() {
4949
/*
5050
function fb_rate_message() {
5151
$options = get_option('fb_options');
52-
53-
global $current_user;
54-
52+
53+
global $current_user;
54+
5555
$user_id = $current_user->ID;
5656
5757
$page = (isset($_GET['page']) ? $_GET['page'] : null);
5858
59-
if ( !empty($options['app_id']) && !empty( $options['app_secret'] ) && current_user_can( 'publish_posts' ) && !get_user_meta( $user_id, 'fb_rate_message_ignore_notice', true )
60-
&& ( !empty( $options['social_publisher'] ) || !empty( $options['like_button'] ) || !empty( $options['subscribe_button'] ) || !empty( $options['send_button'] ) || !empty( $options['comments'] ) || !empty( $options['recommendations_bar'] ) ) ) {
61-
$like_button_options = array(
62-
"enabled" => "true",
63-
"send" => "true",
64-
"layout" => "button_count",
65-
"action" => "like",
66-
"colorscheme" => "light",
67-
"font" => "arial",
68-
"position" => "both",
69-
"ref" => "wp",
70-
"href" => "http://developers.facebook.com/wordpress",
71-
);
72-
59+
if ( !empty($options['app_id']) && !empty( $options['app_secret'] ) && current_user_can( 'publish_posts' ) && !get_user_meta( $user_id, 'fb_rate_message_ignore_notice', true ) && ( !empty( $options['social_publisher'] ) || !empty( $options['like_button'] ) || !empty( $options['subscribe_button'] ) || !empty( $options['send_button'] ) || !empty( $options['comments'] ) || !empty( $options['recommendations_bar'] ) ) ) {
60+
$like_button_options = array(
61+
'enabled' => 'true',
62+
'send' => 'true',
63+
'layout' => 'button_count',
64+
'action' => 'like',
65+
'colorscheme' => 'light',
66+
'font' => 'arial',
67+
'position' => 'both',
68+
'ref' => 'wp',
69+
'href' => 'http://developers.facebook.com/wordpress'
70+
);
71+
7372
fb_admin_dialog( sprintf( __( '%1$sEnjoying the Facebook plugin? Please like it, %2$srate it, and mark it as working%3$s! Having a problem? %4$sReport it%5$s. &nbsp;|&nbsp; %6$sDismiss%7$s' ), fb_get_like_button($like_button_options), '<a href="http://wordpress.org/extend/plugins/facebook/" target="_blank">', '</a>', '<a href="http://wordpress.org/support/plugin/facebook" target="_blank">', '</a>', '<a href="' . get_admin_url() . '?fb_rate_message_ignore=1' . '">', '</a>' ), false);
7473
}
7574
}

fb-open-graph.php

+4-6
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
* @param string $property whitespace separated list of CURIEs placed in a property attribute
77
* @param mixed content attribute value for the given property. use an array for array property values or structured properties
88
*/
9-
109
function fb_output_og_protocol( $property, $content ) {
1110
if ( empty( $property ) || empty( $content ) )
1211
return;
@@ -28,11 +27,10 @@ function fb_output_og_protocol( $property, $content ) {
2827
}
2928

3029
function fb_strip_and_format_desc( $post ) {
31-
32-
$desc_no_html = "";
30+
$desc_no_html = '';
3331
$desc_no_html = strip_shortcodes( $desc_no_html ); // Strip shortcodes first in case there is HTML inside the shortcode
34-
$desc_no_html = wp_strip_all_tags( $desc_no_html ); // Strip all html
35-
$desc_no_html = trim( $desc_no_html ); // Trim the final string, we may have stripped everything out of the post so this will make the value empty if that's the case
32+
$desc_no_html = wp_strip_all_tags( $desc_no_html ); // Strip all html
33+
$desc_no_html = trim( $desc_no_html ); // Trim the final string, we may have stripped everything out of the post so this will make the value empty if that's the case
3634

3735
// Check if empty, may be that the strip functions above made excerpt empty, doubhtful but we want to be 100% sure.
3836
if( empty($desc_no_html) ) {
@@ -77,7 +75,7 @@ function fb_add_og_protocol() {
7775
if ( post_type_supports( $post_type, 'title' ) )
7876
$meta_tags['http://ogp.me/ns#title'] = get_the_title();
7977
if ( post_type_supports( $post_type, 'excerpt' ) ) {
80-
// thanks to Angelo Mandato (http://wordpress.org/support/topic/plugin-facebook-plugin-conflicts-with-powerpress?replies=16)
78+
// thanks to Angelo Mandato (http://wordpress.org/support/topic/plugin-facebook-plugin-conflicts-with-powerpress)
8179
// Strip and format the wordpress way, but don't apply any other filters which adds junk that ends up getitng stripped back out
8280
if ( !post_password_required($post) ) {
8381
// First lets get the post excerpt (shouldn't have any html, but anyone can enter anything...)

0 commit comments

Comments
 (0)