BuddyPress - Version 1.6.1

Version Description

Fixes 4 bugs

Download this release

Release Info

Developer boonebgorges
Plugin Icon 128x128 BuddyPress
Version 1.6.1
Comparing to
See all releases

Code changes from version 1.6 to 1.6.1

Files changed (15) hide show
  1. bp-core/admin/css/wizard.dev.css +5 -0
  2. bp-core/bp-core-avatars.php +2 -2
  3. bp-core/bp-core-catchuri.php +35 -0
  4. bp-core/bp-core-template.php +36 -0
  5. bp-languages/buddypress.pot +39 -39
  6. bp-loader.php +2 -2
  7. bp-members/bp-members-screens.php +4 -0
  8. bp-members/bp-members-template.php +0 -24
  9. bp-messages/js/autocomplete/license.bgiframe.txt +19 -19
  10. bp-themes/bp-default/license.txt +280 -280
  11. bp-themes/bp-default/readme.txt +21 -21
  12. bp-themes/bp-default/rtl.css +1 -1
  13. bp-themes/bp-default/style.css +1 -1
  14. bp-xprofile/bp-xprofile-template.php +6 -1
  15. readme.txt +4 -1
bp-core/admin/css/wizard.dev.css CHANGED
@@ -146,6 +146,11 @@ div#bp-wizard table.form-table th {
146
  margin: 3px 0 0 0;
147
  }
148
 
 
 
 
 
 
149
  div#bp-wizard code, div#bp-wizard kbd {
150
  font-size: 12px;
151
  background: #f0f0f0;
146
  margin: 3px 0 0 0;
147
  }
148
 
149
+ #bp-wizard .widefat th {
150
+ vertical-align: top;
151
+ display: table-cell;
152
+ }
153
+
154
  div#bp-wizard code, div#bp-wizard kbd {
155
  font-size: 12px;
156
  background: #f0f0f0;
bp-core/bp-core-avatars.php CHANGED
@@ -313,7 +313,7 @@ function bp_core_fetch_avatar( $args = '' ) {
313
  if ( isset( $avatar_url ) ) {
314
 
315
  // Return it wrapped in an <img> element
316
- if ( !empty( $html ) ) {
317
  return apply_filters( 'bp_core_fetch_avatar', '<img src="' . $avatar_url . '" alt="' . esc_attr( $alt ) . '" class="' . esc_attr( $class ) . '"' . $css_id . $html_width . $html_height . $title . ' />', $params, $item_id, $avatar_dir, $css_id, $html_width, $html_height, $avatar_folder_url, $avatar_folder_dir );
318
 
319
  // ...or only the URL
@@ -375,7 +375,7 @@ function bp_core_fetch_avatar( $args = '' ) {
375
  $gravatar = apply_filters( "bp_core_default_avatar_$object", BP_PLUGIN_URL . 'bp-core/images/mystery-man.jpg', $params );
376
  }
377
 
378
- if ( !empty( $html ) )
379
  return apply_filters( 'bp_core_fetch_avatar', '<img src="' . $gravatar . '" alt="' . esc_attr( $alt ) . '" class="' . esc_attr( $class ) . '"' . $css_id . $html_width . $html_height . $title . ' />', $params, $item_id, $avatar_dir, $css_id, $html_width, $html_height, $avatar_folder_url, $avatar_folder_dir );
380
  else
381
  return apply_filters( 'bp_core_fetch_avatar_url', $gravatar );
313
  if ( isset( $avatar_url ) ) {
314
 
315
  // Return it wrapped in an <img> element
316
+ if ( true === $html ) {
317
  return apply_filters( 'bp_core_fetch_avatar', '<img src="' . $avatar_url . '" alt="' . esc_attr( $alt ) . '" class="' . esc_attr( $class ) . '"' . $css_id . $html_width . $html_height . $title . ' />', $params, $item_id, $avatar_dir, $css_id, $html_width, $html_height, $avatar_folder_url, $avatar_folder_dir );
318
 
319
  // ...or only the URL
375
  $gravatar = apply_filters( "bp_core_default_avatar_$object", BP_PLUGIN_URL . 'bp-core/images/mystery-man.jpg', $params );
376
  }
377
 
378
+ if ( true === $html )
379
  return apply_filters( 'bp_core_fetch_avatar', '<img src="' . $gravatar . '" alt="' . esc_attr( $alt ) . '" class="' . esc_attr( $class ) . '"' . $css_id . $html_width . $html_height . $title . ' />', $params, $item_id, $avatar_dir, $css_id, $html_width, $html_height, $avatar_folder_url, $avatar_folder_dir );
380
  else
381
  return apply_filters( 'bp_core_fetch_avatar_url', $gravatar );
bp-core/bp-core-catchuri.php CHANGED
@@ -680,6 +680,41 @@ function _bp_maybe_remove_redirect_canonical() {
680
  }
681
  add_action( 'bp_init', '_bp_maybe_remove_redirect_canonical' );
682
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
683
  /**
684
  * Remove WordPress's rel=canonical HTML tag if we are trying to load BuddyPress
685
  * specific content.
680
  }
681
  add_action( 'bp_init', '_bp_maybe_remove_redirect_canonical' );
682
 
683
+ /**
684
+ * Rehook maybe_redirect_404() to run later than the default
685
+ *
686
+ * WordPress's maybe_redirect_404() allows admins on a multisite installation
687
+ * to define 'NOBLOGREDIRECT', a URL to which 404 requests will be redirected.
688
+ * maybe_redirect_404() is hooked to template_redirect at priority 10, which
689
+ * creates a race condition with bp_template_redirect(), our piggyback hook.
690
+ * Due to a legacy bug in BuddyPress, internal BP content (such as members and
691
+ * groups) is marked 404 in $wp_query until bp_core_load_template(), when BP
692
+ * manually overrides the automatic 404. However, the race condition with
693
+ * maybe_redirect_404() means that this manual un-404-ing doesn't happen in
694
+ * time, with the results that maybe_redirect_404() thinks that the page is
695
+ * a legitimate 404, and redirects incorrectly to NOBLOGREDIRECT.
696
+ *
697
+ * By switching maybe_redirect_404() to catch at a higher priority, we avoid
698
+ * the race condition. If bp_core_load_template() runs, it dies before reaching
699
+ * maybe_redirect_404(). If bp_core_load_template() does not run, it means that
700
+ * the 404 is legitimate, and maybe_redirect_404() can proceed as expected.
701
+ *
702
+ * This function will be removed in a later version of BuddyPress. Plugins
703
+ * (and plugin authors!) should ignore it.
704
+ *
705
+ * @since 1.6.1
706
+ *
707
+ * @link http://buddypress.trac.wordpress.org/ticket/4329
708
+ * @link http://buddypress.trac.wordpress.org/ticket/4415
709
+ */
710
+ function _bp_rehook_maybe_redirect_404() {
711
+ if ( defined( 'NOBLOGREDIRECT' ) ) {
712
+ remove_action( 'template_redirect', 'maybe_redirect_404' );
713
+ add_action( 'template_redirect', 'maybe_redirect_404', 100 );
714
+ }
715
+ }
716
+ add_action( 'template_redirect', '_bp_rehook_maybe_redirect_404', 1 );
717
+
718
  /**
719
  * Remove WordPress's rel=canonical HTML tag if we are trying to load BuddyPress
720
  * specific content.
bp-core/bp-core-template.php CHANGED
@@ -751,6 +751,42 @@ function bp_search_slug() {
751
  return apply_filters( 'bp_get_search_slug', BP_SEARCH_SLUG );
752
  }
753
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
754
  /** is_() functions to determine the current page *****************************/
755
 
756
  /**
751
  return apply_filters( 'bp_get_search_slug', BP_SEARCH_SLUG );
752
  }
753
 
754
+ /**
755
+ * Get the id of the currently displayed user
756
+ *
757
+ * @uses apply_filters() Filter 'bp_displayed_user_id' to change this value
758
+ * @return int
759
+ */
760
+ function bp_displayed_user_id() {
761
+
762
+ static $id = 0;
763
+
764
+ if ( empty( $id ) ) {
765
+ global $bp;
766
+ $id = !empty( $bp->displayed_user->id ) ? $bp->displayed_user->id : 0;
767
+ }
768
+
769
+ return apply_filters( 'bp_displayed_user_id', $id );
770
+ }
771
+
772
+ /**
773
+ * Get the id of the currently logged-in user
774
+ *
775
+ * @uses apply_filters() Filter 'bp_loggedin_user_id' to change this value
776
+ * @return int
777
+ */
778
+ function bp_loggedin_user_id() {
779
+
780
+ static $id = 0;
781
+
782
+ if ( empty( $id ) ) {
783
+ global $bp;
784
+ $id = !empty( $bp->loggedin_user->id ) ? $bp->loggedin_user->id : 0;
785
+ }
786
+
787
+ return apply_filters( 'bp_loggedin_user_id', $id );
788
+ }
789
+
790
  /** is_() functions to determine the current page *****************************/
791
 
792
  /**
bp-languages/buddypress.pot CHANGED
@@ -4,7 +4,7 @@ msgid ""
4
  msgstr ""
5
  "Project-Id-Version: BuddyPress \n"
6
  "Report-Msgid-Bugs-To: http://wppolyglots.wordpress.com\n"
7
- "POT-Creation-Date: 2012-08-05 21:37:42+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
@@ -1715,51 +1715,51 @@ msgstr ""
1715
  msgid "My Account"
1716
  msgstr ""
1717
 
1718
- #: bp-core/bp-core-avatars.php:223
1719
  msgid "Avatar Image"
1720
  msgstr ""
1721
 
1722
- #: bp-core/bp-core-avatars.php:484
1723
  msgid "There is no error, the file uploaded with success"
1724
  msgstr ""
1725
 
1726
- #: bp-core/bp-core-avatars.php:485 bp-core/bp-core-avatars.php:486
1727
  msgid "Your image was bigger than the maximum allowed file size of: "
1728
  msgstr ""
1729
 
1730
- #: bp-core/bp-core-avatars.php:487
1731
  msgid "The uploaded file was only partially uploaded"
1732
  msgstr ""
1733
 
1734
- #: bp-core/bp-core-avatars.php:488
1735
  msgid "No file was uploaded"
1736
  msgstr ""
1737
 
1738
- #: bp-core/bp-core-avatars.php:489
1739
  msgid "Missing a temporary folder"
1740
  msgstr ""
1741
 
1742
- #: bp-core/bp-core-avatars.php:493
1743
  msgid "Your upload failed, please try again. Error was: %s"
1744
  msgstr ""
1745
 
1746
- #: bp-core/bp-core-avatars.php:498
1747
  msgid "The file you uploaded is too big. Please upload a file under %s"
1748
  msgstr ""
1749
 
1750
- #: bp-core/bp-core-avatars.php:503
1751
  msgid "Please upload only JPG, GIF or PNG photos."
1752
  msgstr ""
1753
 
1754
- #: bp-core/bp-core-avatars.php:514 bp-core/bp-core-avatars.php:527
1755
  msgid "Upload Failed! Error was: %s"
1756
  msgstr ""
1757
 
1758
- #: bp-core/bp-core-avatars.php:545
1759
  msgid "Upload failed! Error was: %s"
1760
  msgstr ""
1761
 
1762
- #: bp-core/bp-core-avatars.php:680 bp-core/bp-core-classes.php:174
1763
  #: bp-core/bp-core-classes.php:175 bp-core/bp-core-classes.php:176
1764
  #: bp-core/bp-core-template.php:98 bp-core/bp-core-template.php:107
1765
  msgid "Avatar of %s"
@@ -1798,11 +1798,11 @@ msgstr ""
1798
  msgid "Random Site"
1799
  msgstr ""
1800
 
1801
- #: bp-core/bp-core-catchuri.php:281
1802
  msgid "This user has been marked as a spammer. Only site admins can view this profile."
1803
  msgstr ""
1804
 
1805
- #: bp-core/bp-core-catchuri.php:455 bp-core/bp-core-catchuri.php:514
1806
  msgid "You must log in to access the page you requested."
1807
  msgstr ""
1808
 
@@ -3421,8 +3421,8 @@ msgid "Edit Member"
3421
  msgstr ""
3422
 
3423
  #: bp-members/bp-members-adminbar.php:99
3424
- #: bp-xprofile/bp-xprofile-template.php:894
3425
- #: bp-xprofile/bp-xprofile-template.php:895
3426
  msgid "Edit Profile"
3427
  msgstr ""
3428
 
@@ -3541,19 +3541,19 @@ msgstr ""
3541
  msgid "You"
3542
  msgstr ""
3543
 
3544
- #: bp-members/bp-members-screens.php:90
3545
  msgid "Please make sure you enter your password twice"
3546
  msgstr ""
3547
 
3548
- #: bp-members/bp-members-screens.php:94
3549
  msgid "The passwords you entered do not match."
3550
  msgstr ""
3551
 
3552
- #: bp-members/bp-members-screens.php:117
3553
  msgid "This is a required field"
3554
  msgstr ""
3555
 
3556
- #: bp-members/bp-members-screens.php:247
3557
  msgid "Your account is now active!"
3558
  msgstr ""
3559
 
@@ -3596,11 +3596,11 @@ msgstr ""
3596
  msgid "registered %s"
3597
  msgstr ""
3598
 
3599
- #: bp-members/bp-members-template.php:1100
3600
  msgid "Your Avatar"
3601
  msgstr ""
3602
 
3603
- #: bp-members/bp-members-template.php:1170
3604
  msgid "Activity RSS Feed"
3605
  msgstr ""
3606
 
@@ -4393,7 +4393,7 @@ msgstr ""
4393
  #. translators: no option picked in select box
4394
 
4395
  #: bp-themes/bp-default/forums/index.php:116
4396
- #: bp-xprofile/bp-xprofile-template.php:458
4397
  msgid "----"
4398
  msgstr ""
4399
 
@@ -5523,62 +5523,62 @@ msgstr ""
5523
  msgid "Your new avatar was uploaded successfully!"
5524
  msgstr ""
5525
 
5526
- #: bp-xprofile/bp-xprofile-template.php:663
5527
  msgid "January"
5528
  msgstr ""
5529
 
5530
- #: bp-xprofile/bp-xprofile-template.php:664
5531
  msgid "February"
5532
  msgstr ""
5533
 
5534
- #: bp-xprofile/bp-xprofile-template.php:665
5535
  msgid "March"
5536
  msgstr ""
5537
 
5538
- #: bp-xprofile/bp-xprofile-template.php:666
5539
  msgid "April"
5540
  msgstr ""
5541
 
5542
- #: bp-xprofile/bp-xprofile-template.php:667
5543
  msgid "May"
5544
  msgstr ""
5545
 
5546
- #: bp-xprofile/bp-xprofile-template.php:668
5547
  msgid "June"
5548
  msgstr ""
5549
 
5550
- #: bp-xprofile/bp-xprofile-template.php:669
5551
  msgid "July"
5552
  msgstr ""
5553
 
5554
- #: bp-xprofile/bp-xprofile-template.php:670
5555
  msgid "August"
5556
  msgstr ""
5557
 
5558
- #: bp-xprofile/bp-xprofile-template.php:671
5559
  msgid "September"
5560
  msgstr ""
5561
 
5562
- #: bp-xprofile/bp-xprofile-template.php:672
5563
  msgid "October"
5564
  msgstr ""
5565
 
5566
- #: bp-xprofile/bp-xprofile-template.php:673
5567
  msgid "November"
5568
  msgstr ""
5569
 
5570
- #: bp-xprofile/bp-xprofile-template.php:674
5571
  msgid "December"
5572
  msgstr ""
5573
 
5574
- #: bp-xprofile/bp-xprofile-template.php:842
5575
  msgid "Avatar uploads are currently disabled. Why not use a <a href=\"http://gravatar.com\" target=\"_blank\">gravatar</a> instead?"
5576
  msgstr ""
5577
 
5578
- #: bp-xprofile/bp-xprofile-template.php:850
5579
  msgid "Profile not recently updated"
5580
  msgstr ""
5581
 
5582
- #: bp-xprofile/bp-xprofile-template.php:860
5583
  msgid "Profile updated %s"
5584
  msgstr ""
4
  msgstr ""
5
  "Project-Id-Version: BuddyPress \n"
6
  "Report-Msgid-Bugs-To: http://wppolyglots.wordpress.com\n"
7
+ "POT-Creation-Date: 2012-08-08 17:38:32+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
1715
  msgid "My Account"
1716
  msgstr ""
1717
 
1718
+ #: bp-core/bp-core-avatars.php:221
1719
  msgid "Avatar Image"
1720
  msgstr ""
1721
 
1722
+ #: bp-core/bp-core-avatars.php:482
1723
  msgid "There is no error, the file uploaded with success"
1724
  msgstr ""
1725
 
1726
+ #: bp-core/bp-core-avatars.php:483 bp-core/bp-core-avatars.php:484
1727
  msgid "Your image was bigger than the maximum allowed file size of: "
1728
  msgstr ""
1729
 
1730
+ #: bp-core/bp-core-avatars.php:485
1731
  msgid "The uploaded file was only partially uploaded"
1732
  msgstr ""
1733
 
1734
+ #: bp-core/bp-core-avatars.php:486
1735
  msgid "No file was uploaded"
1736
  msgstr ""
1737
 
1738
+ #: bp-core/bp-core-avatars.php:487
1739
  msgid "Missing a temporary folder"
1740
  msgstr ""
1741
 
1742
+ #: bp-core/bp-core-avatars.php:491
1743
  msgid "Your upload failed, please try again. Error was: %s"
1744
  msgstr ""
1745
 
1746
+ #: bp-core/bp-core-avatars.php:496
1747
  msgid "The file you uploaded is too big. Please upload a file under %s"
1748
  msgstr ""
1749
 
1750
+ #: bp-core/bp-core-avatars.php:501
1751
  msgid "Please upload only JPG, GIF or PNG photos."
1752
  msgstr ""
1753
 
1754
+ #: bp-core/bp-core-avatars.php:512 bp-core/bp-core-avatars.php:525
1755
  msgid "Upload Failed! Error was: %s"
1756
  msgstr ""
1757
 
1758
+ #: bp-core/bp-core-avatars.php:543
1759
  msgid "Upload failed! Error was: %s"
1760
  msgstr ""
1761
 
1762
+ #: bp-core/bp-core-avatars.php:678 bp-core/bp-core-classes.php:174
1763
  #: bp-core/bp-core-classes.php:175 bp-core/bp-core-classes.php:176
1764
  #: bp-core/bp-core-template.php:98 bp-core/bp-core-template.php:107
1765
  msgid "Avatar of %s"
1798
  msgid "Random Site"
1799
  msgstr ""
1800
 
1801
+ #: bp-core/bp-core-catchuri.php:278
1802
  msgid "This user has been marked as a spammer. Only site admins can view this profile."
1803
  msgstr ""
1804
 
1805
+ #: bp-core/bp-core-catchuri.php:452 bp-core/bp-core-catchuri.php:511
1806
  msgid "You must log in to access the page you requested."
1807
  msgstr ""
1808
 
3421
  msgstr ""
3422
 
3423
  #: bp-members/bp-members-adminbar.php:99
3424
+ #: bp-xprofile/bp-xprofile-template.php:899
3425
+ #: bp-xprofile/bp-xprofile-template.php:900
3426
  msgid "Edit Profile"
3427
  msgstr ""
3428
 
3541
  msgid "You"
3542
  msgstr ""
3543
 
3544
+ #: bp-members/bp-members-screens.php:94
3545
  msgid "Please make sure you enter your password twice"
3546
  msgstr ""
3547
 
3548
+ #: bp-members/bp-members-screens.php:98
3549
  msgid "The passwords you entered do not match."
3550
  msgstr ""
3551
 
3552
+ #: bp-members/bp-members-screens.php:121
3553
  msgid "This is a required field"
3554
  msgstr ""
3555
 
3556
+ #: bp-members/bp-members-screens.php:251
3557
  msgid "Your account is now active!"
3558
  msgstr ""
3559
 
3596
  msgid "registered %s"
3597
  msgstr ""
3598
 
3599
+ #: bp-members/bp-members-template.php:1076
3600
  msgid "Your Avatar"
3601
  msgstr ""
3602
 
3603
+ #: bp-members/bp-members-template.php:1146
3604
  msgid "Activity RSS Feed"
3605
  msgstr ""
3606
 
4393
  #. translators: no option picked in select box
4394
 
4395
  #: bp-themes/bp-default/forums/index.php:116
4396
+ #: bp-xprofile/bp-xprofile-template.php:463
4397
  msgid "----"
4398
  msgstr ""
4399
 
5523
  msgid "Your new avatar was uploaded successfully!"
5524
  msgstr ""
5525
 
5526
+ #: bp-xprofile/bp-xprofile-template.php:668
5527
  msgid "January"
5528
  msgstr ""
5529
 
5530
+ #: bp-xprofile/bp-xprofile-template.php:669
5531
  msgid "February"
5532
  msgstr ""
5533
 
5534
+ #: bp-xprofile/bp-xprofile-template.php:670
5535
  msgid "March"
5536
  msgstr ""
5537
 
5538
+ #: bp-xprofile/bp-xprofile-template.php:671
5539
  msgid "April"
5540
  msgstr ""
5541
 
5542
+ #: bp-xprofile/bp-xprofile-template.php:672
5543
  msgid "May"
5544
  msgstr ""
5545
 
5546
+ #: bp-xprofile/bp-xprofile-template.php:673
5547
  msgid "June"
5548
  msgstr ""
5549
 
5550
+ #: bp-xprofile/bp-xprofile-template.php:674
5551
  msgid "July"
5552
  msgstr ""
5553
 
5554
+ #: bp-xprofile/bp-xprofile-template.php:675
5555
  msgid "August"
5556
  msgstr ""
5557
 
5558
+ #: bp-xprofile/bp-xprofile-template.php:676
5559
  msgid "September"
5560
  msgstr ""
5561
 
5562
+ #: bp-xprofile/bp-xprofile-template.php:677
5563
  msgid "October"
5564
  msgstr ""
5565
 
5566
+ #: bp-xprofile/bp-xprofile-template.php:678
5567
  msgid "November"
5568
  msgstr ""
5569
 
5570
+ #: bp-xprofile/bp-xprofile-template.php:679
5571
  msgid "December"
5572
  msgstr ""
5573
 
5574
+ #: bp-xprofile/bp-xprofile-template.php:847
5575
  msgid "Avatar uploads are currently disabled. Why not use a <a href=\"http://gravatar.com\" target=\"_blank\">gravatar</a> instead?"
5576
  msgstr ""
5577
 
5578
+ #: bp-xprofile/bp-xprofile-template.php:855
5579
  msgid "Profile not recently updated"
5580
  msgstr ""
5581
 
5582
+ #: bp-xprofile/bp-xprofile-template.php:865
5583
  msgid "Profile updated %s"
5584
  msgstr ""
bp-loader.php CHANGED
@@ -14,7 +14,7 @@
14
  * Description: Social networking in a box. Build a social network for your company, school, sports team or niche community all based on the power and flexibility of WordPress.
15
  * Author: The BuddyPress Community
16
  * Author URI: http://buddypress.org/community/members/
17
- * Version: 1.6
18
  * Text Domain: buddypress
19
  * Domain Path: /bp-languages/
20
  */
@@ -52,7 +52,7 @@ class BuddyPress {
52
  /**
53
  * @var string BuddyPress version
54
  */
55
- public $version = '1.6';
56
 
57
  /**
58
  * @var int Database version of current BuddyPress files
14
  * Description: Social networking in a box. Build a social network for your company, school, sports team or niche community all based on the power and flexibility of WordPress.
15
  * Author: The BuddyPress Community
16
  * Author URI: http://buddypress.org/community/members/
17
+ * Version: 1.6.1
18
  * Text Domain: buddypress
19
  * Domain Path: /bp-languages/
20
  */
52
  /**
53
  * @var string BuddyPress version
54
  */
55
+ public $version = '1.6.1';
56
 
57
  /**
58
  * @var int Database version of current BuddyPress files
bp-members/bp-members-screens.php CHANGED
@@ -67,6 +67,10 @@ function bp_core_screen_signup() {
67
  return;
68
  }
69
 
 
 
 
 
70
  $bp->signup->step = 'request-details';
71
 
72
  if ( !bp_get_signup_allowed() ) {
67
  return;
68
  }
69
 
70
+ if ( !isset( $bp->signup ) ) {
71
+ $bp->signup = new stdClass;
72
+ }
73
+
74
  $bp->signup->step = 'request-details';
75
 
76
  if ( !bp_get_signup_allowed() ) {
bp-members/bp-members-template.php CHANGED
@@ -863,30 +863,6 @@ function bp_displayed_user_link() {
863
  }
864
  function bp_user_link() { bp_displayed_user_domain(); } // Deprecated.
865
 
866
- function bp_displayed_user_id() {
867
-
868
- static $id = 0;
869
-
870
- if ( empty( $id ) ) {
871
- global $bp;
872
- $id = !empty( $bp->displayed_user->id ) ? $bp->displayed_user->id : 0;
873
- }
874
-
875
- return apply_filters( 'bp_displayed_user_id', $id );
876
- }
877
-
878
- function bp_loggedin_user_id() {
879
-
880
- static $id = 0;
881
-
882
- if ( empty( $id ) ) {
883
- global $bp;
884
- $id = !empty( $bp->loggedin_user->id ) ? $bp->loggedin_user->id : 0;
885
- }
886
-
887
- return apply_filters( 'bp_loggedin_user_id', $id );
888
- }
889
-
890
  function bp_current_user_id() { return bp_displayed_user_id(); }
891
 
892
  function bp_displayed_user_domain() {
863
  }
864
  function bp_user_link() { bp_displayed_user_domain(); } // Deprecated.
865
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
866
  function bp_current_user_id() { return bp_displayed_user_id(); }
867
 
868
  function bp_displayed_user_domain() {
bp-messages/js/autocomplete/license.bgiframe.txt CHANGED
@@ -1,20 +1,20 @@
1
- Copyright 2010, Brandon Aaron (http://brandonaaron.net/)
2
-
3
- Permission is hereby granted, free of charge, to any person obtaining
4
- a copy of this software and associated documentation files (the
5
- "Software"), to deal in the Software without restriction, including
6
- without limitation the rights to use, copy, modify, merge, publish,
7
- distribute, sublicense, and/or sell copies of the Software, and to
8
- permit persons to whom the Software is furnished to do so, subject to
9
- the following conditions:
10
-
11
- The above copyright notice and this permission notice shall be
12
- included in all copies or substantial portions of the Software.
13
-
14
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
18
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1
+ Copyright 2010, Brandon Aaron (http://brandonaaron.net/)
2
+
3
+ Permission is hereby granted, free of charge, to any person obtaining
4
+ a copy of this software and associated documentation files (the
5
+ "Software"), to deal in the Software without restriction, including
6
+ without limitation the rights to use, copy, modify, merge, publish,
7
+ distribute, sublicense, and/or sell copies of the Software, and to
8
+ permit persons to whom the Software is furnished to do so, subject to
9
+ the following conditions:
10
+
11
+ The above copyright notice and this permission notice shall be
12
+ included in all copies or substantial portions of the Software.
13
+
14
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
18
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
bp-themes/bp-default/license.txt CHANGED
@@ -1,280 +1,280 @@
1
- GNU GENERAL PUBLIC LICENSE
2
- Version 2, June 1991
3
-
4
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
5
- 675 Mass Ave, Cambridge, MA 02139, USA
6
- Everyone is permitted to copy and distribute verbatim copies
7
- of this license document, but changing it is not allowed.
8
-
9
- Preamble
10
-
11
- The licenses for most software are designed to take away your
12
- freedom to share and change it. By contrast, the GNU General Public
13
- License is intended to guarantee your freedom to share and change free
14
- software--to make sure the software is free for all its users. This
15
- General Public License applies to most of the Free Software
16
- Foundation's software and to any other program whose authors commit to
17
- using it. (Some other Free Software Foundation software is covered by
18
- the GNU Library General Public License instead.) You can apply it to
19
- your programs, too.
20
-
21
- When we speak of free software, we are referring to freedom, not
22
- price. Our General Public Licenses are designed to make sure that you
23
- have the freedom to distribute copies of free software (and charge for
24
- this service if you wish), that you receive source code or can get it
25
- if you want it, that you can change the software or use pieces of it
26
- in new free programs; and that you know you can do these things.
27
-
28
- To protect your rights, we need to make restrictions that forbid
29
- anyone to deny you these rights or to ask you to surrender the rights.
30
- These restrictions translate to certain responsibilities for you if you
31
- distribute copies of the software, or if you modify it.
32
-
33
- For example, if you distribute copies of such a program, whether
34
- gratis or for a fee, you must give the recipients all the rights that
35
- you have. You must make sure that they, too, receive or can get the
36
- source code. And you must show them these terms so they know their
37
- rights.
38
-
39
- We protect your rights with two steps: (1) copyright the software, and
40
- (2) offer you this license which gives you legal permission to copy,
41
- distribute and/or modify the software.
42
-
43
- Also, for each author's protection and ours, we want to make certain
44
- that everyone understands that there is no warranty for this free
45
- software. If the software is modified by someone else and passed on, we
46
- want its recipients to know that what they have is not the original, so
47
- that any problems introduced by others will not reflect on the original
48
- authors' reputations.
49
-
50
- Finally, any free program is threatened constantly by software
51
- patents. We wish to avoid the danger that redistributors of a free
52
- program will individually obtain patent licenses, in effect making the
53
- program proprietary. To prevent this, we have made it clear that any
54
- patent must be licensed for everyone's free use or not licensed at all.
55
-
56
- The precise terms and conditions for copying, distribution and
57
- modification follow.
58
-
59
- GNU GENERAL PUBLIC LICENSE
60
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
61
-
62
- 0. This License applies to any program or other work which contains
63
- a notice placed by the copyright holder saying it may be distributed
64
- under the terms of this General Public License. The "Program", below,
65
- refers to any such program or work, and a "work based on the Program"
66
- means either the Program or any derivative work under copyright law:
67
- that is to say, a work containing the Program or a portion of it,
68
- either verbatim or with modifications and/or translated into another
69
- language. (Hereinafter, translation is included without limitation in
70
- the term "modification".) Each licensee is addressed as "you".
71
-
72
- Activities other than copying, distribution and modification are not
73
- covered by this License; they are outside its scope. The act of
74
- running the Program is not restricted, and the output from the Program
75
- is covered only if its contents constitute a work based on the
76
- Program (independent of having been made by running the Program).
77
- Whether that is true depends on what the Program does.
78
-
79
- 1. You may copy and distribute verbatim copies of the Program's
80
- source code as you receive it, in any medium, provided that you
81
- conspicuously and appropriately publish on each copy an appropriate
82
- copyright notice and disclaimer of warranty; keep intact all the
83
- notices that refer to this License and to the absence of any warranty;
84
- and give any other recipients of the Program a copy of this License
85
- along with the Program.
86
-
87
- You may charge a fee for the physical act of transferring a copy, and
88
- you may at your option offer warranty protection in exchange for a fee.
89
-
90
- 2. You may modify your copy or copies of the Program or any portion
91
- of it, thus forming a work based on the Program, and copy and
92
- distribute such modifications or work under the terms of Section 1
93
- above, provided that you also meet all of these conditions:
94
-
95
- a) You must cause the modified files to carry prominent notices
96
- stating that you changed the files and the date of any change.
97
-
98
- b) You must cause any work that you distribute or publish, that in
99
- whole or in part contains or is derived from the Program or any
100
- part thereof, to be licensed as a whole at no charge to all third
101
- parties under the terms of this License.
102
-
103
- c) If the modified program normally reads commands interactively
104
- when run, you must cause it, when started running for such
105
- interactive use in the most ordinary way, to print or display an
106
- announcement including an appropriate copyright notice and a
107
- notice that there is no warranty (or else, saying that you provide
108
- a warranty) and that users may redistribute the program under
109
- these conditions, and telling the user how to view a copy of this
110
- License. (Exception: if the Program itself is interactive but
111
- does not normally print such an announcement, your work based on
112
- the Program is not required to print an announcement.)
113
-
114
- These requirements apply to the modified work as a whole. If
115
- identifiable sections of that work are not derived from the Program,
116
- and can be reasonably considered independent and separate works in
117
- themselves, then this License, and its terms, do not apply to those
118
- sections when you distribute them as separate works. But when you
119
- distribute the same sections as part of a whole which is a work based
120
- on the Program, the distribution of the whole must be on the terms of
121
- this License, whose permissions for other licensees extend to the
122
- entire whole, and thus to each and every part regardless of who wrote it.
123
- Thus, it is not the intent of this section to claim rights or contest
124
- your rights to work written entirely by you; rather, the intent is to
125
- exercise the right to control the distribution of derivative or
126
- collective works based on the Program.
127
-
128
- In addition, mere aggregation of another work not based on the Program
129
- with the Program (or with a work based on the Program) on a volume of
130
- a storage or distribution medium does not bring the other work under
131
- the scope of this License.
132
-
133
- 3. You may copy and distribute the Program (or a work based on it,
134
- under Section 2) in object code or executable form under the terms of
135
- Sections 1 and 2 above provided that you also do one of the following:
136
-
137
- a) Accompany it with the complete corresponding machine-readable
138
- source code, which must be distributed under the terms of Sections
139
- 1 and 2 above on a medium customarily used for software interchange; or,
140
-
141
- b) Accompany it with a written offer, valid for at least three
142
- years, to give any third party, for a charge no more than your
143
- cost of physically performing source distribution, a complete
144
- machine-readable copy of the corresponding source code, to be
145
- distributed under the terms of Sections 1 and 2 above on a medium
146
- customarily used for software interchange; or,
147
-
148
- c) Accompany it with the information you received as to the offer
149
- to distribute corresponding source code. (This alternative is
150
- allowed only for noncommercial distribution and only if you
151
- received the program in object code or executable form with such
152
- an offer, in accord with Subsection b above.)
153
-
154
- The source code for a work means the preferred form of the work for
155
- making modifications to it. For an executable work, complete source
156
- code means all the source code for all modules it contains, plus any
157
- associated interface definition files, plus the scripts used to
158
- control compilation and installation of the executable. However, as a
159
- special exception, the source code distributed need not include
160
- anything that is normally distributed (in either source or binary
161
- form) with the major components (compiler, kernel, and so on) of the
162
- operating system on which the executable runs, unless that component
163
- itself accompanies the executable.
164
-
165
- If distribution of executable or object code is made by offering
166
- access to copy from a designated place, then offering equivalent
167
- access to copy the source code from the same place counts as
168
- distribution of the source code, even though third parties are not
169
- compelled to copy the source along with the object code.
170
-
171
- 4. You may not copy, modify, sublicense, or distribute the Program
172
- except as expressly provided under this License. Any attempt
173
- otherwise to copy, modify, sublicense or distribute the Program is
174
- void, and will automatically terminate your rights under this License.
175
- However, parties who have received copies, or rights, from you under
176
- this License will not have their licenses terminated so long as such
177
- parties remain in full compliance.
178
-
179
- 5. You are not required to accept this License, since you have not
180
- signed it. However, nothing else grants you permission to modify or
181
- distribute the Program or its derivative works. These actions are
182
- prohibited by law if you do not accept this License. Therefore, by
183
- modifying or distributing the Program (or any work based on the
184
- Program), you indicate your acceptance of this License to do so, and
185
- all its terms and conditions for copying, distributing or modifying
186
- the Program or works based on it.
187
-
188
- 6. Each time you redistribute the Program (or any work based on the
189
- Program), the recipient automatically receives a license from the
190
- original licensor to copy, distribute or modify the Program subject to
191
- these terms and conditions. You may not impose any further
192
- restrictions on the recipients' exercise of the rights granted herein.
193
- You are not responsible for enforcing compliance by third parties to
194
- this License.
195
-
196
- 7. If, as a consequence of a court judgment or allegation of patent
197
- infringement or for any other reason (not limited to patent issues),
198
- conditions are imposed on you (whether by court order, agreement or
199
- otherwise) that contradict the conditions of this License, they do not
200
- excuse you from the conditions of this License. If you cannot
201
- distribute so as to satisfy simultaneously your obligations under this
202
- License and any other pertinent obligations, then as a consequence you
203
- may not distribute the Program at all. For example, if a patent
204
- license would not permit royalty-free redistribution of the Program by
205
- all those who receive copies directly or indirectly through you, then
206
- the only way you could satisfy both it and this License would be to
207
- refrain entirely from distribution of the Program.
208
-
209
- If any portion of this section is held invalid or unenforceable under
210
- any particular circumstance, the balance of the section is intended to
211
- apply and the section as a whole is intended to apply in other
212
- circumstances.
213
-
214
- It is not the purpose of this section to induce you to infringe any
215
- patents or other property right claims or to contest validity of any
216
- such claims; this section has the sole purpose of protecting the
217
- integrity of the free software distribution system, which is
218
- implemented by public license practices. Many people have made
219
- generous contributions to the wide range of software distributed
220
- through that system in reliance on consistent application of that
221
- system; it is up to the author/donor to decide if he or she is willing
222
- to distribute software through any other system and a licensee cannot
223
- impose that choice.
224
-
225
- This section is intended to make thoroughly clear what is believed to
226
- be a consequence of the rest of this License.
227
-
228
- 8. If the distribution and/or use of the Program is restricted in
229
- certain countries either by patents or by copyrighted interfaces, the
230
- original copyright holder who places the Program under this License
231
- may add an explicit geographical distribution limitation excluding
232
- those countries, so that distribution is permitted only in or among
233
- countries not thus excluded. In such case, this License incorporates
234
- the limitation as if written in the body of this License.
235
-
236
- 9. The Free Software Foundation may publish revised and/or new versions
237
- of the General Public License from time to time. Such new versions will
238
- be similar in spirit to the present version, but may differ in detail to
239
- address new problems or concerns.
240
-
241
- Each version is given a distinguishing version number. If the Program
242
- specifies a version number of this License which applies to it and "any
243
- later version", you have the option of following the terms and conditions
244
- either of that version or of any later version published by the Free
245
- Software Foundation. If the Program does not specify a version number of
246
- this License, you may choose any version ever published by the Free Software
247
- Foundation.
248
-
249
- 10. If you wish to incorporate parts of the Program into other free
250
- programs whose distribution conditions are different, write to the author
251
- to ask for permission. For software which is copyrighted by the Free
252
- Software Foundation, write to the Free Software Foundation; we sometimes
253
- make exceptions for this. Our decision will be guided by the two goals
254
- of preserving the free status of all derivatives of our free software and
255
- of promoting the sharing and reuse of software generally.
256
-
257
- NO WARRANTY
258
-
259
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
260
- FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
261
- OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
262
- PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
263
- OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
264
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
265
- TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
266
- PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
267
- REPAIR OR CORRECTION.
268
-
269
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
270
- WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
271
- REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
272
- INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
273
- OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
274
- TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
275
- YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
276
- PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
277
- POSSIBILITY OF SUCH DAMAGES.
278
-
279
- END OF TERMS AND CONDITIONS
280
-
1
+ GNU GENERAL PUBLIC LICENSE
2
+ Version 2, June 1991
3
+
4
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
5
+ 675 Mass Ave, Cambridge, MA 02139, USA
6
+ Everyone is permitted to copy and distribute verbatim copies
7
+ of this license document, but changing it is not allowed.
8
+
9
+ Preamble
10
+
11
+ The licenses for most software are designed to take away your
12
+ freedom to share and change it. By contrast, the GNU General Public
13
+ License is intended to guarantee your freedom to share and change free
14
+ software--to make sure the software is free for all its users. This
15
+ General Public License applies to most of the Free Software
16
+ Foundation's software and to any other program whose authors commit to
17
+ using it. (Some other Free Software Foundation software is covered by
18
+ the GNU Library General Public License instead.) You can apply it to
19
+ your programs, too.
20
+
21
+ When we speak of free software, we are referring to freedom, not
22
+ price. Our General Public Licenses are designed to make sure that you
23
+ have the freedom to distribute copies of free software (and charge for
24
+ this service if you wish), that you receive source code or can get it
25
+ if you want it, that you can change the software or use pieces of it
26
+ in new free programs; and that you know you can do these things.
27
+
28
+ To protect your rights, we need to make restrictions that forbid
29
+ anyone to deny you these rights or to ask you to surrender the rights.
30
+ These restrictions translate to certain responsibilities for you if you
31
+ distribute copies of the software, or if you modify it.
32
+
33
+ For example, if you distribute copies of such a program, whether
34
+ gratis or for a fee, you must give the recipients all the rights that
35
+ you have. You must make sure that they, too, receive or can get the
36
+ source code. And you must show them these terms so they know their
37
+ rights.
38
+
39
+ We protect your rights with two steps: (1) copyright the software, and
40
+ (2) offer you this license which gives you legal permission to copy,
41
+ distribute and/or modify the software.
42
+
43
+ Also, for each author's protection and ours, we want to make certain
44
+ that everyone understands that there is no warranty for this free
45
+ software. If the software is modified by someone else and passed on, we
46
+ want its recipients to know that what they have is not the original, so
47
+ that any problems introduced by others will not reflect on the original
48
+ authors' reputations.
49
+
50
+ Finally, any free program is threatened constantly by software
51
+ patents. We wish to avoid the danger that redistributors of a free
52
+ program will individually obtain patent licenses, in effect making the
53
+ program proprietary. To prevent this, we have made it clear that any
54
+ patent must be licensed for everyone's free use or not licensed at all.
55
+
56
+ The precise terms and conditions for copying, distribution and
57
+ modification follow.
58
+
59
+ GNU GENERAL PUBLIC LICENSE
60
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
61
+
62
+ 0. This License applies to any program or other work which contains
63
+ a notice placed by the copyright holder saying it may be distributed
64
+ under the terms of this General Public License. The "Program", below,
65
+ refers to any such program or work, and a "work based on the Program"
66
+ means either the Program or any derivative work under copyright law:
67
+ that is to say, a work containing the Program or a portion of it,
68
+ either verbatim or with modifications and/or translated into another
69
+ language. (Hereinafter, translation is included without limitation in
70
+ the term "modification".) Each licensee is addressed as "you".
71
+
72
+ Activities other than copying, distribution and modification are not
73
+ covered by this License; they are outside its scope. The act of
74
+ running the Program is not restricted, and the output from the Program
75
+ is covered only if its contents constitute a work based on the
76
+ Program (independent of having been made by running the Program).
77
+ Whether that is true depends on what the Program does.
78
+
79
+ 1. You may copy and distribute verbatim copies of the Program's
80
+ source code as you receive it, in any medium, provided that you
81
+ conspicuously and appropriately publish on each copy an appropriate
82
+ copyright notice and disclaimer of warranty; keep intact all the
83
+ notices that refer to this License and to the absence of any warranty;
84
+ and give any other recipients of the Program a copy of this License
85
+ along with the Program.
86
+
87
+ You may charge a fee for the physical act of transferring a copy, and
88
+ you may at your option offer warranty protection in exchange for a fee.
89
+
90
+ 2. You may modify your copy or copies of the Program or any portion
91
+ of it, thus forming a work based on the Program, and copy and
92
+ distribute such modifications or work under the terms of Section 1
93
+ above, provided that you also meet all of these conditions:
94
+
95
+ a) You must cause the modified files to carry prominent notices
96
+ stating that you changed the files and the date of any change.
97
+
98
+ b) You must cause any work that you distribute or publish, that in
99
+ whole or in part contains or is derived from the Program or any
100
+ part thereof, to be licensed as a whole at no charge to all third
101
+ parties under the terms of this License.
102
+
103
+ c) If the modified program normally reads commands interactively
104
+ when run, you must cause it, when started running for such
105
+ interactive use in the most ordinary way, to print or display an
106
+ announcement including an appropriate copyright notice and a
107
+ notice that there is no warranty (or else, saying that you provide
108
+ a warranty) and that users may redistribute the program under
109
+ these conditions, and telling the user how to view a copy of this
110
+ License. (Exception: if the Program itself is interactive but
111
+ does not normally print such an announcement, your work based on
112
+ the Program is not required to print an announcement.)
113
+
114
+ These requirements apply to the modified work as a whole. If
115
+ identifiable sections of that work are not derived from the Program,
116
+ and can be reasonably considered independent and separate works in
117
+ themselves, then this License, and its terms, do not apply to those
118
+ sections when you distribute them as separate works. But when you
119
+ distribute the same sections as part of a whole which is a work based
120
+ on the Program, the distribution of the whole must be on the terms of
121
+ this License, whose permissions for other licensees extend to the
122
+ entire whole, and thus to each and every part regardless of who wrote it.
123
+ Thus, it is not the intent of this section to claim rights or contest
124
+ your rights to work written entirely by you; rather, the intent is to
125
+ exercise the right to control the distribution of derivative or
126
+ collective works based on the Program.
127
+
128
+ In addition, mere aggregation of another work not based on the Program
129
+ with the Program (or with a work based on the Program) on a volume of
130
+ a storage or distribution medium does not bring the other work under
131
+ the scope of this License.
132
+
133
+ 3. You may copy and distribute the Program (or a work based on it,
134
+ under Section 2) in object code or executable form under the terms of
135
+ Sections 1 and 2 above provided that you also do one of the following:
136
+
137
+ a) Accompany it with the complete corresponding machine-readable
138
+ source code, which must be distributed under the terms of Sections
139
+ 1 and 2 above on a medium customarily used for software interchange; or,
140
+
141
+ b) Accompany it with a written offer, valid for at least three
142
+ years, to give any third party, for a charge no more than your
143
+ cost of physically performing source distribution, a complete
144
+ machine-readable copy of the corresponding source code, to be
145
+ distributed under the terms of Sections 1 and 2 above on a medium
146
+ customarily used for software interchange; or,
147
+
148
+ c) Accompany it with the information you received as to the offer
149
+ to distribute corresponding source code. (This alternative is
150
+ allowed only for noncommercial distribution and only if you
151
+ received the program in object code or executable form with such
152
+ an offer, in accord with Subsection b above.)
153
+
154
+ The source code for a work means the preferred form of the work for
155
+ making modifications to it. For an executable work, complete source
156
+ code means all the source code for all modules it contains, plus any
157
+ associated interface definition files, plus the scripts used to
158
+ control compilation and installation of the executable. However, as a
159
+ special exception, the source code distributed need not include
160
+ anything that is normally distributed (in either source or binary
161
+ form) with the major components (compiler, kernel, and so on) of the
162
+ operating system on which the executable runs, unless that component
163
+ itself accompanies the executable.
164
+
165
+ If distribution of executable or object code is made by offering
166
+ access to copy from a designated place, then offering equivalent
167
+ access to copy the source code from the same place counts as
168
+ distribution of the source code, even though third parties are not
169
+ compelled to copy the source along with the object code.
170
+
171
+ 4. You may not copy, modify, sublicense, or distribute the Program
172
+ except as expressly provided under this License. Any attempt
173
+ otherwise to copy, modify, sublicense or distribute the Program is
174
+ void, and will automatically terminate your rights under this License.
175
+ However, parties who have received copies, or rights, from you under
176
+ this License will not have their licenses terminated so long as such
177
+ parties remain in full compliance.
178
+
179
+ 5. You are not required to accept this License, since you have not
180
+ signed it. However, nothing else grants you permission to modify or
181
+ distribute the Program or its derivative works. These actions are
182
+ prohibited by law if you do not accept this License. Therefore, by
183
+ modifying or distributing the Program (or any work based on the
184
+ Program), you indicate your acceptance of this License to do so, and
185
+ all its terms and conditions for copying, distributing or modifying
186
+ the Program or works based on it.
187
+
188
+ 6. Each time you redistribute the Program (or any work based on the
189
+ Program), the recipient automatically receives a license from the
190
+ original licensor to copy, distribute or modify the Program subject to
191
+ these terms and conditions. You may not impose any further
192
+ restrictions on the recipients' exercise of the rights granted herein.
193
+ You are not responsible for enforcing compliance by third parties to
194
+ this License.
195
+
196
+ 7. If, as a consequence of a court judgment or allegation of patent
197
+ infringement or for any other reason (not limited to patent issues),
198
+ conditions are imposed on you (whether by court order, agreement or
199
+ otherwise) that contradict the conditions of this License, they do not
200
+ excuse you from the conditions of this License. If you cannot
201
+ distribute so as to satisfy simultaneously your obligations under this
202
+ License and any other pertinent obligations, then as a consequence you
203
+ may not distribute the Program at all. For example, if a patent
204
+ license would not permit royalty-free redistribution of the Program by
205
+ all those who receive copies directly or indirectly through you, then
206
+ the only way you could satisfy both it and this License would be to
207
+ refrain entirely from distribution of the Program.
208
+
209
+ If any portion of this section is held invalid or unenforceable under
210
+ any particular circumstance, the balance of the section is intended to
211
+ apply and the section as a whole is intended to apply in other
212
+ circumstances.
213
+
214
+ It is not the purpose of this section to induce you to infringe any
215
+ patents or other property right claims or to contest validity of any
216
+ such claims; this section has the sole purpose of protecting the
217
+ integrity of the free software distribution system, which is
218
+ implemented by public license practices. Many people have made
219
+ generous contributions to the wide range of software distributed
220
+ through that system in reliance on consistent application of that
221
+ system; it is up to the author/donor to decide if he or she is willing
222
+ to distribute software through any other system and a licensee cannot
223
+ impose that choice.
224
+
225
+ This section is intended to make thoroughly clear what is believed to
226
+ be a consequence of the rest of this License.
227
+
228
+ 8. If the distribution and/or use of the Program is restricted in
229
+ certain countries either by patents or by copyrighted interfaces, the
230
+ original copyright holder who places the Program under this License
231
+ may add an explicit geographical distribution limitation excluding
232
+ those countries, so that distribution is permitted only in or among
233
+ countries not thus excluded. In such case, this License incorporates
234
+ the limitation as if written in the body of this License.
235
+
236
+ 9. The Free Software Foundation may publish revised and/or new versions
237
+ of the General Public License from time to time. Such new versions will
238
+ be similar in spirit to the present version, but may differ in detail to
239
+ address new problems or concerns.
240
+
241
+ Each version is given a distinguishing version number. If the Program
242
+ specifies a version number of this License which applies to it and "any
243
+ later version", you have the option of following the terms and conditions
244
+ either of that version or of any later version published by the Free
245
+ Software Foundation. If the Program does not specify a version number of
246
+ this License, you may choose any version ever published by the Free Software
247
+ Foundation.
248
+
249
+ 10. If you wish to incorporate parts of the Program into other free
250
+ programs whose distribution conditions are different, write to the author
251
+ to ask for permission. For software which is copyrighted by the Free
252
+ Software Foundation, write to the Free Software Foundation; we sometimes
253
+ make exceptions for this. Our decision will be guided by the two goals
254
+ of preserving the free status of all derivatives of our free software and
255
+ of promoting the sharing and reuse of software generally.
256
+
257
+ NO WARRANTY
258
+
259
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
260
+ FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
261
+ OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
262
+ PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
263
+ OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
264
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
265
+ TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
266
+ PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
267
+ REPAIR OR CORRECTION.
268
+
269
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
270
+ WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
271
+ REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
272
+ INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
273
+ OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
274
+ TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
275
+ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
276
+ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
277
+ POSSIBILITY OF SUCH DAMAGES.
278
+
279
+ END OF TERMS AND CONDITIONS
280
+
bp-themes/bp-default/readme.txt CHANGED
@@ -1,22 +1,22 @@
1
- --- BuddyPress Default ---
2
- Clean and stylish, BuddyPress Default lets you build a social network straight out of the box. Make it yours with a custom menu, header image, and background. Along with five widgetized areas (one in the sidebar, four in the footer), BP-Default supports featured images (as custom header images on posts and pages) and is furnished with an optional one-column page template that removes the sidebar, and a stylesheet for the admin Visual Editor.
3
-
4
-
5
- --- Installation ---
6
- The theme is bundled with BuddyPress. After activating the plugin, BuddyPress Default will be added to the "Appearance > Themes" menu in your WordPress admin area.
7
-
8
-
9
- --- About BuddyPress ---
10
- Social networking in a box. Build a social network for your company, school, sports team or niche community all based on the power and flexibility of WordPress. BuddyPress will let users register on your site and start creating profiles, posting messages, making connections, creating and interacting in groups and much more.
11
-
12
- For help with BuddyPress Default, or for more information about BuddyPress, please visit http://buddypress.org/.
13
-
14
-
15
- --- Building a BuddyPress theme ---
16
- If you want to make a custom theme based on BuddyPress Default, DO NOT copy and edit it. By doing this you will make updates and maintenance much harder for yourself. Instead, please review this codex page for instructions on how to build a BuddyPress child theme:
17
-
18
- http://codex.buddypress.org/how-to-guides/building-a-buddypress-child-theme/
19
-
20
-
21
- --- Changelog ---
22
  A list of changes is available at http://codex.buddypress.org/theme-development/bp-default-theme-changelog/.
1
+ --- BuddyPress Default ---
2
+ Clean and stylish, BuddyPress Default lets you build a social network straight out of the box. Make it yours with a custom menu, header image, and background. Along with five widgetized areas (one in the sidebar, four in the footer), BP-Default supports featured images (as custom header images on posts and pages) and is furnished with an optional one-column page template that removes the sidebar, and a stylesheet for the admin Visual Editor.
3
+
4
+
5
+ --- Installation ---
6
+ The theme is bundled with BuddyPress. After activating the plugin, BuddyPress Default will be added to the "Appearance > Themes" menu in your WordPress admin area.
7
+
8
+
9
+ --- About BuddyPress ---
10
+ Social networking in a box. Build a social network for your company, school, sports team or niche community all based on the power and flexibility of WordPress. BuddyPress will let users register on your site and start creating profiles, posting messages, making connections, creating and interacting in groups and much more.
11
+
12
+ For help with BuddyPress Default, or for more information about BuddyPress, please visit http://buddypress.org/.
13
+
14
+
15
+ --- Building a BuddyPress theme ---
16
+ If you want to make a custom theme based on BuddyPress Default, DO NOT copy and edit it. By doing this you will make updates and maintenance much harder for yourself. Instead, please review this codex page for instructions on how to build a BuddyPress child theme:
17
+
18
+ http://codex.buddypress.org/how-to-guides/building-a-buddypress-child-theme/
19
+
20
+
21
+ --- Changelog ---
22
  A list of changes is available at http://codex.buddypress.org/theme-development/bp-default-theme-changelog/.
bp-themes/bp-default/rtl.css CHANGED
@@ -2,7 +2,7 @@
2
  * Theme Name: BuddyPress Default
3
  * Theme URI: http://buddypress.org/extend/themes/
4
  * Description: Clean and stylish, BuddyPress Default lets you build a social network straight out of the box. Make it yours with a custom menu, header image, and background. Along with five widgetized areas (one in the sidebar, four in the footer), BP-Default supports featured images (as custom header images on posts and pages) and is furnished with an optional one-column page template that removes the sidebar, and a stylesheet for the admin Visual Editor.
5
- * Version: 1.6
6
  * Author: the BuddyPress team
7
  * Author URI: http://buddypress.org
8
  * License: GNU General Public License
2
  * Theme Name: BuddyPress Default
3
  * Theme URI: http://buddypress.org/extend/themes/
4
  * Description: Clean and stylish, BuddyPress Default lets you build a social network straight out of the box. Make it yours with a custom menu, header image, and background. Along with five widgetized areas (one in the sidebar, four in the footer), BP-Default supports featured images (as custom header images on posts and pages) and is furnished with an optional one-column page template that removes the sidebar, and a stylesheet for the admin Visual Editor.
5
+ * Version: 1.6.1
6
  * Author: the BuddyPress team
7
  * Author URI: http://buddypress.org
8
  * License: GNU General Public License
bp-themes/bp-default/style.css CHANGED
@@ -2,7 +2,7 @@
2
  * Theme Name: BuddyPress Default
3
  * Theme URI: http://buddypress.org/extend/themes/
4
  * Description: Clean and stylish, BuddyPress Default lets you build a social network straight out of the box. Make it yours with a custom menu, header image, and background. Along with five widgetized areas (one in the sidebar, four in the footer), BP-Default supports featured images (as custom header images on posts and pages) and is furnished with an optional one-column page template that removes the sidebar, and a stylesheet for the admin Visual Editor.
5
- * Version: 1.6
6
  * Author: the BuddyPress team
7
  * Author URI: http://buddypress.org
8
  * License: GNU General Public License
2
  * Theme Name: BuddyPress Default
3
  * Theme URI: http://buddypress.org/extend/themes/
4
  * Description: Clean and stylish, BuddyPress Default lets you build a social network straight out of the box. Make it yours with a custom menu, header image, and background. Along with five widgetized areas (one in the sidebar, four in the footer), BP-Default supports featured images (as custom header images on posts and pages) and is furnished with an optional one-column page template that removes the sidebar, and a stylesheet for the admin Visual Editor.
5
+ * Version: 1.6.1
6
  * Author: the BuddyPress team
7
  * Author URI: http://buddypress.org
8
  * License: GNU General Public License
bp-xprofile/bp-xprofile-template.php CHANGED
@@ -340,8 +340,13 @@ function bp_the_profile_field_edit_value() {
340
  * Check to see if the posted value is different, if it is re-display this
341
  * value as long as it's not empty and a required field.
342
  */
343
- if ( !isset( $field->data->value ) )
 
 
 
 
344
  $field->data->value = '';
 
345
 
346
  if ( isset( $_POST['field_' . $field->id] ) && $field->data->value != $_POST['field_' . $field->id] ) {
347
  if ( !empty( $_POST['field_' . $field->id] ) )
340
  * Check to see if the posted value is different, if it is re-display this
341
  * value as long as it's not empty and a required field.
342
  */
343
+ if ( !isset( $field->data ) ) {
344
+ $field->data = new stdClass;
345
+ }
346
+
347
+ if ( !isset( $field->data->value ) ) {
348
  $field->data->value = '';
349
+ }
350
 
351
  if ( isset( $_POST['field_' . $field->id] ) && $field->data->value != $_POST['field_' . $field->id] ) {
352
  if ( !empty( $_POST['field_' . $field->id] ) )
readme.txt CHANGED
@@ -3,7 +3,7 @@ Contributors: johnjamesjacoby, DJPaul, boonebgorges
3
  Tags: buddypress, social networking, activity, profiles, messaging, friends, groups, forums, microblogging, twitter, facebook, social, community, networks, networking, cms
4
  Requires at least: 3.4
5
  Tested up to: 3.4.1
6
- Stable tag: 1.6
7
  License: GPLv2 or later
8
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
9
 
@@ -86,6 +86,9 @@ BuddyPress is available in more than 20 languages. For more information, check o
86
 
87
  == Upgrade Notice ==
88
 
 
 
 
89
  = 1.6 =
90
  See: http://codex.buddypress.org/releases/version-1-6/
91
 
3
  Tags: buddypress, social networking, activity, profiles, messaging, friends, groups, forums, microblogging, twitter, facebook, social, community, networks, networking, cms
4
  Requires at least: 3.4
5
  Tested up to: 3.4.1
6
+ Stable tag: 1.6.1
7
  License: GPLv2 or later
8
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
9
 
86
 
87
  == Upgrade Notice ==
88
 
89
+ = 1.6.1 =
90
+ Fixes 4 bugs
91
+
92
  = 1.6 =
93
  See: http://codex.buddypress.org/releases/version-1-6/
94