BuddyPress - Version 1.5.3.1

Version Description

  • Fixes bug related to password changes
  • See http://codex.buddypress.org/releases/version-1-5-3-1/
Download this release

Release Info

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

Code changes from version 1.5.2 to 1.5.3.1

bp-blogs/bp-blogs-classes.php CHANGED
@@ -14,7 +14,7 @@ Class BP_Blogs_Blog {
14
  function __construct( $id = null ) {
15
  global $bp, $wpdb;
16
 
17
- $user_id = $bp->displayed_user->id;
18
 
19
  if ( $id ) {
20
  $this->id = $id;
14
  function __construct( $id = null ) {
15
  global $bp, $wpdb;
16
 
17
+ $user_id = bp_displayed_user_id();
18
 
19
  if ( $id ) {
20
  $this->id = $id;
bp-blogs/bp-blogs-functions.php CHANGED
@@ -236,7 +236,7 @@ function bp_blogs_record_comment( $comment_id, $is_approved = true ) {
236
  return false;
237
 
238
  // Get the user_id from the comment author email.
239
- $user = get_user_by_email( $recorded_comment->comment_author_email );
240
  $user_id = (int)$user->ID;
241
 
242
  // If there's no registered user id, don't record activity
236
  return false;
237
 
238
  // Get the user_id from the comment author email.
239
+ $user = get_user_by( 'email', $recorded_comment->comment_author_email );
240
  $user_id = (int)$user->ID;
241
 
242
  // If there's no registered user id, don't record activity
bp-core/bp-core-adminbar.php CHANGED
@@ -241,9 +241,6 @@ function bp_core_load_admin_bar_css() {
241
  if ( !bp_use_wp_admin_bar() )
242
  return;
243
 
244
- if ( '3.3' == bp_get_major_wp_version() )
245
- return;
246
-
247
  // Admin bar styles
248
  if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG )
249
  $stylesheet = BP_PLUGIN_URL . '/bp-core/css/admin-bar.dev.css';
241
  if ( !bp_use_wp_admin_bar() )
242
  return;
243
 
 
 
 
244
  // Admin bar styles
245
  if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG )
246
  $stylesheet = BP_PLUGIN_URL . '/bp-core/css/admin-bar.dev.css';
bp-core/bp-core-avatars.php CHANGED
@@ -584,7 +584,7 @@ function bp_core_fetch_avatar_filter( $avatar, $user, $size, $default, $alt = ''
584
  $id = $user;
585
 
586
  // If passed a string and that string returns a user, get the $id
587
- else if ( is_string( $user ) && ( $user_by_email = get_user_by_email( $user ) ) )
588
  $id = $user_by_email->ID;
589
 
590
  // If somehow $id hasn't been assigned, return the result of get_avatar
584
  $id = $user;
585
 
586
  // If passed a string and that string returns a user, get the $id
587
+ else if ( is_string( $user ) && ( $user_by_email = get_user_by( 'email', $user ) ) )
588
  $id = $user_by_email->ID;
589
 
590
  // If somehow $id hasn't been assigned, return the result of get_avatar
bp-core/bp-core-catchuri.php CHANGED
@@ -186,7 +186,7 @@ function bp_core_set_uri_globals() {
186
  if ( empty( $matches ) && defined( 'BP_ENABLE_ROOT_PROFILES' ) && BP_ENABLE_ROOT_PROFILES ) {
187
 
188
  // Make sure there's a user corresponding to $bp_uri[0]
189
- if ( !empty( $bp->pages->members ) && !empty( $bp_uri[0] ) && $root_profile = get_userdatabylogin( $bp_uri[0] ) ) {
190
 
191
  // Force BP to recognize that this is a members page
192
  $matches[] = 1;
186
  if ( empty( $matches ) && defined( 'BP_ENABLE_ROOT_PROFILES' ) && BP_ENABLE_ROOT_PROFILES ) {
187
 
188
  // Make sure there's a user corresponding to $bp_uri[0]
189
+ if ( !empty( $bp->pages->members ) && !empty( $bp_uri[0] ) && $root_profile = get_user_by( 'login', $bp_uri[0] ) ) {
190
 
191
  // Force BP to recognize that this is a members page
192
  $matches[] = 1;
bp-core/bp-core-filters.php CHANGED
@@ -13,15 +13,17 @@ if ( !defined( 'ABSPATH' ) ) exit;
13
  */
14
  function bp_core_exclude_pages( $pages ) {
15
  global $bp;
16
-
17
- if ( !empty( $bp->pages->activate ) )
18
- $pages[] = $bp->pages->activate->id;
19
-
20
- if ( !empty( $bp->pages->register ) )
21
- $pages[] = $bp->pages->register->id;
22
-
23
- if ( !empty( $bp->pages->forums ) && ( !bp_is_active( 'forums' ) || ( bp_is_active( 'forums' ) && bp_forums_has_directory() && !bp_forums_is_installed_correctly() ) ) )
24
- $pages[] = $bp->pages->forums->id;
 
 
25
 
26
  return apply_filters( 'bp_core_exclude_pages', $pages );
27
  }
13
  */
14
  function bp_core_exclude_pages( $pages ) {
15
  global $bp;
16
+
17
+ if ( bp_is_root_blog() ) {
18
+ if ( !empty( $bp->pages->activate ) )
19
+ $pages[] = $bp->pages->activate->id;
20
+
21
+ if ( !empty( $bp->pages->register ) )
22
+ $pages[] = $bp->pages->register->id;
23
+
24
+ if ( !empty( $bp->pages->forums ) && ( !bp_is_active( 'forums' ) || ( bp_is_active( 'forums' ) && bp_forums_has_directory() && !bp_forums_is_installed_correctly() ) ) )
25
+ $pages[] = $bp->pages->forums->id;
26
+ }
27
 
28
  return apply_filters( 'bp_core_exclude_pages', $pages );
29
  }
bp-core/css/admin-bar.css CHANGED
@@ -1 +1 @@
1
- #wpadminbar .quicklinks li#wp-admin-bar-my-account ul,#wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar ul{left:0;right:auto;}#wpadminbar .quicklinks li#wp-admin-bar-user-admin-with-avatar>a{border-left:none;background:url(../images/admin-bar-sprite.png?d=11122010) top left no-repeat;}#wpadminbar .quicklinks li#wp-admin-bar-user-admin-with-avatar>a img,#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar>a img{width:16px;height:16px;display:inline;border:1px solid #999;vertical-align:middle;margin:-2px 23px 0 -5px;padding:0;background:#eee;float:none;}#wpadminbar .quicklinks li#wp-admin-bar-user-admin-with-avatar ul,#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul{left:30px;}#wpadminbar .quicklinks li#wp-admin-bar-user-admin-with-avatar ul ul,#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul ul{left:0;}#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar>a{border-left:none;background:url(../images/admin-bar-sprite.png?d=11122010) top left no-repeat;}#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar>a img{width:16px;height:16px;display:inline;border:1px solid #999;vertical-align:middle;margin:-2px 23px 0 -5px;padding:0;background:#eee;float:none;}#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul{left:0;}#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul ul{left:0;}#wpadminbar .quicklinks li#wp-admin-bar-my-account a span.count,#wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar a span.count,#wpadminbar .quicklinks li#wp-admin-bar-bp-notifications #ab-pending-notifications{background:#eee;color:#333;text-shadow:none;display:inline;padding:2px 5px;font-size:10px;font-weight:bold;-moz-border-radius:10px;-khtml-border-radius:10px;-webkit-border-radius:10px;border-radius:10px;}
1
+ #wpadminbar .quicklinks li#wp-admin-bar-my-account ul,#wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar ul{left:0;right:auto;}#wp-admin-bar-user-info img.avatar{height:64px;width:64px;}#wpadminbar .quicklinks li#wp-admin-bar-user-admin-with-avatar>a{border-left:none;background:url(../images/admin-bar-sprite.png?d=11122010) top left no-repeat;}#wpadminbar .quicklinks li#wp-admin-bar-user-admin-with-avatar>a img,#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar>a img{width:16px;height:16px;display:inline;border:1px solid #999;vertical-align:middle;margin:-2px 23px 0 -5px;padding:0;background:#eee;float:none;}#wpadminbar .quicklinks li#wp-admin-bar-user-admin-with-avatar ul,#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul{left:30px;}#wpadminbar .quicklinks li#wp-admin-bar-user-admin-with-avatar ul ul,#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul ul{left:0;}#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar>a{border-left:none;background:url(../images/admin-bar-sprite.png?d=11122010) top left no-repeat;}#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul{left:0;}#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul ul{left:0;}#wpadminbar .quicklinks li#wp-admin-bar-my-account a span.count,#wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar a span.count,#wpadminbar .quicklinks li#wp-admin-bar-bp-notifications #ab-pending-notifications{background:#eee;color:#333;text-shadow:none;display:inline;padding:2px 5px;font-size:10px;font-weight:bold;-moz-border-radius:10px;-khtml-border-radius:10px;-webkit-border-radius:10px;border-radius:10px;}
bp-core/css/admin-bar.dev.css CHANGED
@@ -3,6 +3,10 @@
3
  left: 0;
4
  right: auto;
5
  }
 
 
 
 
6
 
7
  /* Displayed User */
8
  #wpadminbar .quicklinks li#wp-admin-bar-user-admin-with-avatar > a {
3
  left: 0;
4
  right: auto;
5
  }
6
+ #wp-admin-bar-user-info img.avatar {
7
+ height: 64px;
8
+ width: 64px;
9
+ }
10
 
11
  /* Displayed User */
12
  #wpadminbar .quicklinks li#wp-admin-bar-user-admin-with-avatar > a {
bp-groups/bp-groups-actions.php CHANGED
@@ -103,10 +103,10 @@ function groups_action_create_group() {
103
  bp_core_redirect( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create/step/' . $bp->groups->current_create_step . '/' );
104
  }
105
 
106
- // Set the invite status
107
  // Checked against a whitelist for security
108
  $allowed_invite_status = apply_filters( 'groups_allowed_invite_status', array( 'members', 'mods', 'admins' ) );
109
- $invite_status = in_array( $_POST['group-invite-status'], (array)$allowed_invite_status ) ? $_POST['group-invite-status'] : 'members';
110
 
111
  groups_update_groupmeta( $bp->groups->new_group_id, 'invite_status', $invite_status );
112
  }
103
  bp_core_redirect( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create/step/' . $bp->groups->current_create_step . '/' );
104
  }
105
 
106
+ // Set the invite status
107
  // Checked against a whitelist for security
108
  $allowed_invite_status = apply_filters( 'groups_allowed_invite_status', array( 'members', 'mods', 'admins' ) );
109
+ $invite_status = !empty( $_POST['group-invite-status'] ) && in_array( $_POST['group-invite-status'], (array)$allowed_invite_status ) ? $_POST['group-invite-status'] : 'members';
110
 
111
  groups_update_groupmeta( $bp->groups->new_group_id, 'invite_status', $invite_status );
112
  }
bp-languages/buddypress.pot CHANGED
@@ -4,7 +4,7 @@ msgid ""
4
  msgstr ""
5
  "Project-Id-Version: BuddyPress \n"
6
  "Report-Msgid-Bugs-To: wp-polyglots@lists.automattic.com\n"
7
- "POT-Creation-Date: 2011-12-13 02:31: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"
@@ -90,7 +90,6 @@ msgstr ""
90
  #: bp-groups/bp-groups-widgets.php:70 bp-groups/bp-groups-widgets.php:170
91
  #: bp-members/bp-members-template.php:559
92
  #: bp-members/bp-members-template.php:833
93
- #: bp-themes/bp-default/forums/single/forum-header.php:13
94
  #: bp-themes/bp-default/groups/groups-loop.php:47
95
  #: bp-themes/bp-default/groups/single/group-header.php:42
96
  msgid "active %s"
@@ -183,7 +182,7 @@ msgstr ""
183
  msgid "<a href=\"%1$s\">%2$s</a> is your new site. <a href=\"%3$s\">Login</a> as \"%4$s\" using your existing password."
184
  msgstr ""
185
 
186
- #: bp-blogs/bp-blogs-template.php:587 bp-core/bp-core-filters.php:318
187
  #: bp-themes/bp-default/blogs/index.php:23
188
  #: bp-themes/bp-default/blogs/create.php:21
189
  msgid "Create a Site"
@@ -281,7 +280,6 @@ msgstr ""
281
  #: bp-core/bp-core-widgets.php:121 bp-core/bp-core-widgets.php:201
282
  #: bp-core/bp-core-widgets.php:270 bp-groups/bp-groups-widgets.php:118
283
  #: bp-themes/bp-default/forums/index.php:104
284
- #: bp-themes/bp-default/forums/single/edit.php:49
285
  #: bp-themes/bp-default/groups/single/forum/edit.php:49
286
  #: bp-themes/bp-default/groups/single/forum.php:75
287
  msgid "Title:"
@@ -1035,11 +1033,11 @@ msgstr ""
1035
  msgid " [&hellip;]"
1036
  msgstr ""
1037
 
1038
- #: bp-core/bp-core-filters.php:161 bp-core/bp-core-filters.php:185
1039
  msgid "[User Set]"
1040
  msgstr ""
1041
 
1042
- #: bp-core/bp-core-filters.php:204
1043
  msgid ""
1044
  "Thanks for registering! To complete the activation of your account and blog, please click the following link:\n"
1045
  "\n"
@@ -1052,11 +1050,11 @@ msgid ""
1052
  "%2$s"
1053
  msgstr ""
1054
 
1055
- #: bp-core/bp-core-filters.php:205
1056
  msgid "Activate %s"
1057
  msgstr ""
1058
 
1059
- #: bp-core/bp-core-filters.php:237 bp-members/bp-members-signup.php:574
1060
  msgid ""
1061
  "Thanks for registering! To complete the activation of your account please click the following link:\n"
1062
  "\n"
@@ -1064,39 +1062,39 @@ msgid ""
1064
  "\n"
1065
  msgstr ""
1066
 
1067
- #: bp-core/bp-core-filters.php:238 bp-members/bp-members-signup.php:575
1068
  msgid "Activate Your Account"
1069
  msgstr ""
1070
 
1071
  #. translators: "displayed user's name | canonicalised component name"
1072
  #. translators: "group name | group nav section name"
1073
 
1074
- #: bp-core/bp-core-filters.php:284 bp-core/bp-core-filters.php:290
1075
  msgid "%1$s | %2$s"
1076
  msgstr ""
1077
 
1078
  #. translators: "component item name | component nav section name | root
1079
  #. component name"
1080
 
1081
- #: bp-core/bp-core-filters.php:295
1082
  msgid "%1$s | %2$s | %3$s"
1083
  msgstr ""
1084
 
1085
- #: bp-core/bp-core-filters.php:300 bp-core/bp-core-filters.php:302
1086
  msgid "%s Directory"
1087
  msgstr ""
1088
 
1089
- #: bp-core/bp-core-filters.php:306
1090
  #: bp-themes/bp-default/registration/register.php:23
1091
  msgid "Create an Account"
1092
  msgstr ""
1093
 
1094
- #: bp-core/bp-core-filters.php:310
1095
  #: bp-themes/bp-default/registration/activate.php:24
1096
  msgid "Activate your Account"
1097
  msgstr ""
1098
 
1099
- #: bp-core/bp-core-filters.php:314 bp-themes/bp-default/groups/index.php:23
1100
  #: bp-themes/bp-default/groups/create.php:18
1101
  msgid "Create a Group"
1102
  msgstr ""
@@ -1548,21 +1546,21 @@ msgstr ""
1548
  msgid "Delete Account"
1549
  msgstr ""
1550
 
1551
- #: bp-settings/bp-settings-actions.php:96
1552
- #: bp-settings/bp-settings-actions.php:135
1553
  #: bp-xprofile/bp-xprofile-screens.php:113
1554
  msgid "Changes saved."
1555
  msgstr ""
1556
 
1557
- #: bp-settings/bp-settings-actions.php:99
1558
  msgid "Your new passwords did not match."
1559
  msgstr ""
1560
 
1561
- #: bp-settings/bp-settings-actions.php:102
1562
  msgid "Your existing password is incorrect."
1563
  msgstr ""
1564
 
1565
- #: bp-settings/bp-settings-actions.php:105
1566
  msgid "Sorry, that email address is already used or is invalid."
1567
  msgstr ""
1568
 
@@ -2314,7 +2312,6 @@ msgstr ""
2314
 
2315
  #: bp-groups/bp-groups-template.php:1499 bp-groups/bp-groups-template.php:1500
2316
  #: bp-themes/bp-default/forums/index.php:23
2317
- #: bp-themes/bp-default/forums/single/forum.php:19
2318
  #: bp-themes/bp-default/groups/single/forum.php:19
2319
  msgid "New Topic"
2320
  msgstr ""
@@ -2441,8 +2438,6 @@ msgstr ""
2441
  #: bp-themes/bp-default/members/single/settings/notifications.php:62
2442
  #: bp-themes/bp-default/members/single/settings/general.php:69
2443
  #: bp-themes/bp-default/members/single/profile/edit.php:126
2444
- #: bp-themes/bp-default/forums/single/edit.php:57
2445
- #: bp-themes/bp-default/forums/single/edit.php:73
2446
  #: bp-themes/bp-default/groups/single/forum/edit.php:60
2447
  #: bp-themes/bp-default/groups/single/forum/edit.php:76
2448
  #: bp-themes/bp-default/groups/single/admin.php:32
@@ -2486,7 +2481,6 @@ msgstr ""
2486
  #: bp-themes/bp-default/members/single/blogs.php:19
2487
  #: bp-themes/bp-default/blogs/index.php:55
2488
  #: bp-themes/bp-default/forums/index.php:60
2489
- #: bp-themes/bp-default/forums/single/forum.php:34
2490
  #: bp-themes/bp-default/groups/index.php:57
2491
  #: bp-themes/bp-default/groups/single/forum.php:36
2492
  msgid "Order By:"
@@ -3883,7 +3877,6 @@ msgstr ""
3883
  #: bp-themes/bp-default/members/single/blogs.php:21
3884
  #: bp-themes/bp-default/blogs/index.php:57
3885
  #: bp-themes/bp-default/forums/index.php:62
3886
- #: bp-themes/bp-default/forums/single/forum.php:36
3887
  #: bp-themes/bp-default/groups/index.php:59
3888
  #: bp-themes/bp-default/groups/single/forum.php:38
3889
  msgid "Last Active"
@@ -4032,14 +4025,12 @@ msgstr ""
4032
 
4033
  #: bp-themes/bp-default/members/single/forums.php:21
4034
  #: bp-themes/bp-default/forums/index.php:63
4035
- #: bp-themes/bp-default/forums/single/forum.php:37
4036
  #: bp-themes/bp-default/groups/single/forum.php:39
4037
  msgid "Most Posts"
4038
  msgstr ""
4039
 
4040
  #: bp-themes/bp-default/members/single/forums.php:22
4041
  #: bp-themes/bp-default/forums/index.php:64
4042
- #: bp-themes/bp-default/forums/single/forum.php:38
4043
  #: bp-themes/bp-default/groups/single/forum.php:40
4044
  msgid "Unreplied"
4045
  msgstr ""
@@ -4239,7 +4230,6 @@ msgid "<a href=\"%1$s\">%2$s</a> replied <a href=\"%3$s\" class=\"activity-time-
4239
  msgstr ""
4240
 
4241
  #: bp-themes/bp-default/activity/comment.php:37
4242
- #: bp-themes/bp-default/forums/single/edit.php:10
4243
  #: bp-themes/bp-default/groups/single/forum/edit.php:10
4244
  msgid "Reply"
4245
  msgstr ""
@@ -4325,7 +4315,6 @@ msgid "Create New Topic:"
4325
  msgstr ""
4326
 
4327
  #: bp-themes/bp-default/forums/index.php:107
4328
- #: bp-themes/bp-default/forums/single/edit.php:52
4329
  #: bp-themes/bp-default/groups/single/forum/edit.php:52
4330
  #: bp-themes/bp-default/groups/single/forum.php:78
4331
  msgid "Content:"
@@ -4378,89 +4367,74 @@ msgstr ""
4378
  msgid "Sorry, there were no forum topics found."
4379
  msgstr ""
4380
 
4381
- #: bp-themes/bp-default/forums/single/forum.php:25
4382
- #: bp-themes/bp-default/forums/single/edit.php:16
4383
- #: bp-themes/bp-default/forums/single/topic.php:45
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
4384
  #: bp-themes/bp-default/groups/single/forum/edit.php:16
4385
  #: bp-themes/bp-default/groups/single/forum/topic.php:20
4386
  #: bp-themes/bp-default/groups/single/forum.php:27
4387
  msgid "Forum Directory"
4388
  msgstr ""
4389
 
4390
- #: bp-themes/bp-default/forums/single/edit.php:25
4391
  #: bp-themes/bp-default/groups/single/forum/edit.php:25
4392
  msgid "Edit:"
4393
  msgstr ""
4394
 
4395
- #: bp-themes/bp-default/forums/single/edit.php:88
4396
  #: bp-themes/bp-default/groups/single/forum/edit.php:91
4397
  msgid "This topic does not exist."
4398
  msgstr ""
4399
 
4400
- #: bp-themes/bp-default/forums/single/topic.php:38
4401
  #: bp-themes/bp-default/groups/single/forum/topic.php:12
4402
  msgid "New Reply"
4403
  msgstr ""
4404
 
4405
- #: bp-themes/bp-default/forums/single/topic.php:99
4406
- msgid "%s said %s ago:"
 
 
 
 
4407
  msgstr ""
4408
 
4409
- #: bp-themes/bp-default/forums/single/topic.php:119
4410
  #: bp-themes/bp-default/groups/single/forum/topic.php:95
4411
  msgid "Permanent link to this post"
4412
  msgstr ""
4413
 
4414
- #: bp-themes/bp-default/forums/single/topic.php:155
 
 
 
4415
  #: bp-themes/bp-default/groups/single/forum/topic.php:131
4416
  msgid "Add a reply:"
4417
  msgstr ""
4418
 
4419
- #: bp-themes/bp-default/forums/single/topic.php:160
4420
  #: bp-themes/bp-default/groups/single/forum/topic.php:136
4421
  msgid "Post Reply"
4422
  msgstr ""
4423
 
4424
- #: bp-themes/bp-default/forums/single/topic.php:171
4425
  #: bp-themes/bp-default/groups/single/forum/topic.php:147
4426
  msgid "This topic is closed, replies are no longer accepted."
4427
  msgstr ""
4428
 
4429
- #: bp-themes/bp-default/forums/single/topic.php:186
4430
  #: bp-themes/bp-default/groups/single/forum/topic.php:161
4431
  msgid "There are no posts for this topic."
4432
  msgstr ""
4433
 
4434
- #: bp-themes/bp-default/groups/index.php:23
4435
- #: bp-themes/bp-default/groups/create.php:18
4436
- msgid "Groups Directory"
4437
- msgstr ""
4438
-
4439
- #: bp-themes/bp-default/groups/index.php:37
4440
- msgid "All Groups <span>%s</span>"
4441
- msgstr ""
4442
-
4443
- #: bp-themes/bp-default/groups/groups-loop.php:95
4444
- msgid "There were no groups found."
4445
- msgstr ""
4446
-
4447
- #: bp-themes/bp-default/groups/single/members.php:87
4448
- #: bp-themes/bp-default/groups/single/admin.php:288
4449
- msgid "This group has no members."
4450
- msgstr ""
4451
-
4452
- #: bp-themes/bp-default/groups/single/forum/topic.php:35
4453
- msgid "Topic tags:"
4454
- msgstr ""
4455
-
4456
- #: bp-themes/bp-default/groups/single/forum/topic.php:81
4457
- msgid "%1$s said %2$s:"
4458
- msgstr ""
4459
-
4460
- #: bp-themes/bp-default/groups/single/forum/topic.php:126
4461
- msgid "You will auto join this group when you reply to this topic."
4462
- msgstr ""
4463
-
4464
  #: bp-themes/bp-default/groups/single/request-membership.php:4
4465
  msgid "You are requesting to become a member of the group '%s'."
4466
  msgstr ""
4
  msgstr ""
5
  "Project-Id-Version: BuddyPress \n"
6
  "Report-Msgid-Bugs-To: wp-polyglots@lists.automattic.com\n"
7
+ "POT-Creation-Date: 2011-12-23 20:31:22+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
90
  #: bp-groups/bp-groups-widgets.php:70 bp-groups/bp-groups-widgets.php:170
91
  #: bp-members/bp-members-template.php:559
92
  #: bp-members/bp-members-template.php:833
 
93
  #: bp-themes/bp-default/groups/groups-loop.php:47
94
  #: bp-themes/bp-default/groups/single/group-header.php:42
95
  msgid "active %s"
182
  msgid "<a href=\"%1$s\">%2$s</a> is your new site. <a href=\"%3$s\">Login</a> as \"%4$s\" using your existing password."
183
  msgstr ""
184
 
185
+ #: bp-blogs/bp-blogs-template.php:587 bp-core/bp-core-filters.php:320
186
  #: bp-themes/bp-default/blogs/index.php:23
187
  #: bp-themes/bp-default/blogs/create.php:21
188
  msgid "Create a Site"
280
  #: bp-core/bp-core-widgets.php:121 bp-core/bp-core-widgets.php:201
281
  #: bp-core/bp-core-widgets.php:270 bp-groups/bp-groups-widgets.php:118
282
  #: bp-themes/bp-default/forums/index.php:104
 
283
  #: bp-themes/bp-default/groups/single/forum/edit.php:49
284
  #: bp-themes/bp-default/groups/single/forum.php:75
285
  msgid "Title:"
1033
  msgid " [&hellip;]"
1034
  msgstr ""
1035
 
1036
+ #: bp-core/bp-core-filters.php:163 bp-core/bp-core-filters.php:187
1037
  msgid "[User Set]"
1038
  msgstr ""
1039
 
1040
+ #: bp-core/bp-core-filters.php:206
1041
  msgid ""
1042
  "Thanks for registering! To complete the activation of your account and blog, please click the following link:\n"
1043
  "\n"
1050
  "%2$s"
1051
  msgstr ""
1052
 
1053
+ #: bp-core/bp-core-filters.php:207
1054
  msgid "Activate %s"
1055
  msgstr ""
1056
 
1057
+ #: bp-core/bp-core-filters.php:239 bp-members/bp-members-signup.php:574
1058
  msgid ""
1059
  "Thanks for registering! To complete the activation of your account please click the following link:\n"
1060
  "\n"
1062
  "\n"
1063
  msgstr ""
1064
 
1065
+ #: bp-core/bp-core-filters.php:240 bp-members/bp-members-signup.php:575
1066
  msgid "Activate Your Account"
1067
  msgstr ""
1068
 
1069
  #. translators: "displayed user's name | canonicalised component name"
1070
  #. translators: "group name | group nav section name"
1071
 
1072
+ #: bp-core/bp-core-filters.php:286 bp-core/bp-core-filters.php:292
1073
  msgid "%1$s | %2$s"
1074
  msgstr ""
1075
 
1076
  #. translators: "component item name | component nav section name | root
1077
  #. component name"
1078
 
1079
+ #: bp-core/bp-core-filters.php:297
1080
  msgid "%1$s | %2$s | %3$s"
1081
  msgstr ""
1082
 
1083
+ #: bp-core/bp-core-filters.php:302 bp-core/bp-core-filters.php:304
1084
  msgid "%s Directory"
1085
  msgstr ""
1086
 
1087
+ #: bp-core/bp-core-filters.php:308
1088
  #: bp-themes/bp-default/registration/register.php:23
1089
  msgid "Create an Account"
1090
  msgstr ""
1091
 
1092
+ #: bp-core/bp-core-filters.php:312
1093
  #: bp-themes/bp-default/registration/activate.php:24
1094
  msgid "Activate your Account"
1095
  msgstr ""
1096
 
1097
+ #: bp-core/bp-core-filters.php:316 bp-themes/bp-default/groups/index.php:23
1098
  #: bp-themes/bp-default/groups/create.php:18
1099
  msgid "Create a Group"
1100
  msgstr ""
1546
  msgid "Delete Account"
1547
  msgstr ""
1548
 
1549
+ #: bp-settings/bp-settings-actions.php:102
1550
+ #: bp-settings/bp-settings-actions.php:141
1551
  #: bp-xprofile/bp-xprofile-screens.php:113
1552
  msgid "Changes saved."
1553
  msgstr ""
1554
 
1555
+ #: bp-settings/bp-settings-actions.php:105
1556
  msgid "Your new passwords did not match."
1557
  msgstr ""
1558
 
1559
+ #: bp-settings/bp-settings-actions.php:108
1560
  msgid "Your existing password is incorrect."
1561
  msgstr ""
1562
 
1563
+ #: bp-settings/bp-settings-actions.php:111
1564
  msgid "Sorry, that email address is already used or is invalid."
1565
  msgstr ""
1566
 
2312
 
2313
  #: bp-groups/bp-groups-template.php:1499 bp-groups/bp-groups-template.php:1500
2314
  #: bp-themes/bp-default/forums/index.php:23
 
2315
  #: bp-themes/bp-default/groups/single/forum.php:19
2316
  msgid "New Topic"
2317
  msgstr ""
2438
  #: bp-themes/bp-default/members/single/settings/notifications.php:62
2439
  #: bp-themes/bp-default/members/single/settings/general.php:69
2440
  #: bp-themes/bp-default/members/single/profile/edit.php:126
 
 
2441
  #: bp-themes/bp-default/groups/single/forum/edit.php:60
2442
  #: bp-themes/bp-default/groups/single/forum/edit.php:76
2443
  #: bp-themes/bp-default/groups/single/admin.php:32
2481
  #: bp-themes/bp-default/members/single/blogs.php:19
2482
  #: bp-themes/bp-default/blogs/index.php:55
2483
  #: bp-themes/bp-default/forums/index.php:60
 
2484
  #: bp-themes/bp-default/groups/index.php:57
2485
  #: bp-themes/bp-default/groups/single/forum.php:36
2486
  msgid "Order By:"
3877
  #: bp-themes/bp-default/members/single/blogs.php:21
3878
  #: bp-themes/bp-default/blogs/index.php:57
3879
  #: bp-themes/bp-default/forums/index.php:62
 
3880
  #: bp-themes/bp-default/groups/index.php:59
3881
  #: bp-themes/bp-default/groups/single/forum.php:38
3882
  msgid "Last Active"
4025
 
4026
  #: bp-themes/bp-default/members/single/forums.php:21
4027
  #: bp-themes/bp-default/forums/index.php:63
 
4028
  #: bp-themes/bp-default/groups/single/forum.php:39
4029
  msgid "Most Posts"
4030
  msgstr ""
4031
 
4032
  #: bp-themes/bp-default/members/single/forums.php:22
4033
  #: bp-themes/bp-default/forums/index.php:64
 
4034
  #: bp-themes/bp-default/groups/single/forum.php:40
4035
  msgid "Unreplied"
4036
  msgstr ""
4230
  msgstr ""
4231
 
4232
  #: bp-themes/bp-default/activity/comment.php:37
 
4233
  #: bp-themes/bp-default/groups/single/forum/edit.php:10
4234
  msgid "Reply"
4235
  msgstr ""
4315
  msgstr ""
4316
 
4317
  #: bp-themes/bp-default/forums/index.php:107
 
4318
  #: bp-themes/bp-default/groups/single/forum/edit.php:52
4319
  #: bp-themes/bp-default/groups/single/forum.php:78
4320
  msgid "Content:"
4367
  msgid "Sorry, there were no forum topics found."
4368
  msgstr ""
4369
 
4370
+ #: bp-themes/bp-default/groups/index.php:23
4371
+ #: bp-themes/bp-default/groups/create.php:18
4372
+ msgid "Groups Directory"
4373
+ msgstr ""
4374
+
4375
+ #: bp-themes/bp-default/groups/index.php:37
4376
+ msgid "All Groups <span>%s</span>"
4377
+ msgstr ""
4378
+
4379
+ #: bp-themes/bp-default/groups/groups-loop.php:95
4380
+ msgid "There were no groups found."
4381
+ msgstr ""
4382
+
4383
+ #: bp-themes/bp-default/groups/single/members.php:87
4384
+ #: bp-themes/bp-default/groups/single/admin.php:288
4385
+ msgid "This group has no members."
4386
+ msgstr ""
4387
+
4388
  #: bp-themes/bp-default/groups/single/forum/edit.php:16
4389
  #: bp-themes/bp-default/groups/single/forum/topic.php:20
4390
  #: bp-themes/bp-default/groups/single/forum.php:27
4391
  msgid "Forum Directory"
4392
  msgstr ""
4393
 
 
4394
  #: bp-themes/bp-default/groups/single/forum/edit.php:25
4395
  msgid "Edit:"
4396
  msgstr ""
4397
 
 
4398
  #: bp-themes/bp-default/groups/single/forum/edit.php:91
4399
  msgid "This topic does not exist."
4400
  msgstr ""
4401
 
 
4402
  #: bp-themes/bp-default/groups/single/forum/topic.php:12
4403
  msgid "New Reply"
4404
  msgstr ""
4405
 
4406
+ #: bp-themes/bp-default/groups/single/forum/topic.php:35
4407
+ msgid "Topic tags:"
4408
+ msgstr ""
4409
+
4410
+ #: bp-themes/bp-default/groups/single/forum/topic.php:81
4411
+ msgid "%1$s said %2$s:"
4412
  msgstr ""
4413
 
 
4414
  #: bp-themes/bp-default/groups/single/forum/topic.php:95
4415
  msgid "Permanent link to this post"
4416
  msgstr ""
4417
 
4418
+ #: bp-themes/bp-default/groups/single/forum/topic.php:126
4419
+ msgid "You will auto join this group when you reply to this topic."
4420
+ msgstr ""
4421
+
4422
  #: bp-themes/bp-default/groups/single/forum/topic.php:131
4423
  msgid "Add a reply:"
4424
  msgstr ""
4425
 
 
4426
  #: bp-themes/bp-default/groups/single/forum/topic.php:136
4427
  msgid "Post Reply"
4428
  msgstr ""
4429
 
 
4430
  #: bp-themes/bp-default/groups/single/forum/topic.php:147
4431
  msgid "This topic is closed, replies are no longer accepted."
4432
  msgstr ""
4433
 
 
4434
  #: bp-themes/bp-default/groups/single/forum/topic.php:161
4435
  msgid "There are no posts for this topic."
4436
  msgstr ""
4437
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
4438
  #: bp-themes/bp-default/groups/single/request-membership.php:4
4439
  msgid "You are requesting to become a member of the group '%s'."
4440
  msgstr ""
bp-loader.php CHANGED
@@ -4,7 +4,7 @@
4
  * Plugin URI: http://buddypress.org
5
  * 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.
6
  * Author: The BuddyPress Community
7
- * Version: 1.5.2
8
  * Author URI: http://buddypress.org/community/members/
9
  * Network: true
10
  */
@@ -17,7 +17,7 @@ global $wpdb;
17
 
18
  // Define the BuddyPress version
19
  if ( !defined( 'BP_VERSION' ) )
20
- define( 'BP_VERSION', '1.5.2' );
21
 
22
  // Define the database version
23
  if ( !defined( 'BP_DB_VERSION' ) )
4
  * Plugin URI: http://buddypress.org
5
  * 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.
6
  * Author: The BuddyPress Community
7
+ * Version: 1.5.3.1
8
  * Author URI: http://buddypress.org/community/members/
9
  * Network: true
10
  */
17
 
18
  // Define the BuddyPress version
19
  if ( !defined( 'BP_VERSION' ) )
20
+ define( 'BP_VERSION', '1.5.3.1' );
21
 
22
  // Define the database version
23
  if ( !defined( 'BP_DB_VERSION' ) )
bp-members/bp-members-functions.php CHANGED
@@ -445,11 +445,11 @@ add_filter( 'bp_core_get_user_displayname', 'stripslashes' );
445
  * @package BuddyPress Core
446
  * @param $email str The email address for the user.
447
  * @uses bp_core_get_userlink() BuddyPress function to get a userlink by user ID.
448
- * @uses get_user_by_email() WordPress function to get userdata via an email address
449
  * @return str The link to the users home base. False on no match.
450
  */
451
  function bp_core_get_userlink_by_email( $email ) {
452
- $user = get_user_by_email( $email );
453
  return apply_filters( 'bp_core_get_userlink_by_email', bp_core_get_userlink( $user->ID, false, false, true ) );
454
  }
455
 
@@ -657,14 +657,14 @@ add_action( 'pre_user_login', 'bp_core_strip_username_spaces' );
657
  * @package BuddyPress Core
658
  * @param $auth_obj The WP authorization object
659
  * @param $username The username of the user logging in.
660
- * @uses get_userdatabylogin() Get the userdata object for a user based on their username
661
  * @uses bp_core_redirect() Safe redirect to a page
662
  * @return $auth_obj If the user is not a spammer, return the authorization object
663
  */
664
  function bp_core_boot_spammer( $auth_obj, $username ) {
665
  global $bp;
666
 
667
- if ( !$user = get_userdatabylogin( $username ) )
668
  return $auth_obj;
669
 
670
  if ( ( is_multisite() && (int)$user->spam ) || 1 == (int)$user->user_status )
445
  * @package BuddyPress Core
446
  * @param $email str The email address for the user.
447
  * @uses bp_core_get_userlink() BuddyPress function to get a userlink by user ID.
448
+ * @uses get_user_by() WordPress function to get userdata via an email address
449
  * @return str The link to the users home base. False on no match.
450
  */
451
  function bp_core_get_userlink_by_email( $email ) {
452
+ $user = get_user_by( 'email', $email );
453
  return apply_filters( 'bp_core_get_userlink_by_email', bp_core_get_userlink( $user->ID, false, false, true ) );
454
  }
455
 
657
  * @package BuddyPress Core
658
  * @param $auth_obj The WP authorization object
659
  * @param $username The username of the user logging in.
660
+ * @uses get_user_by() Get the userdata object for a user based on their username
661
  * @uses bp_core_redirect() Safe redirect to a page
662
  * @return $auth_obj If the user is not a spammer, return the authorization object
663
  */
664
  function bp_core_boot_spammer( $auth_obj, $username ) {
665
  global $bp;
666
 
667
+ if ( !$user = get_user_by( 'login', $username ) )
668
  return $auth_obj;
669
 
670
  if ( ( is_multisite() && (int)$user->spam ) || 1 == (int)$user->user_status )
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-settings/bp-settings-actions.php CHANGED
@@ -24,6 +24,12 @@ function bp_core_screen_general_settings() {
24
  if ( is_super_admin() || ( !empty( $_POST['pwd'] ) && $_POST['pwd'] != '' && wp_check_password( $_POST['pwd'], $bp->displayed_user->userdata->user_pass, $bp->displayed_user->id ) ) ) {
25
 
26
  $update_user = get_userdata( $bp->displayed_user->id );
 
 
 
 
 
 
27
 
28
  // Make sure changing an email address does not already exist
29
  if ( $_POST['email'] != '' ) {
@@ -82,7 +88,6 @@ function bp_core_screen_general_settings() {
82
 
83
  // Make sure these changes are in $bp for the current page load
84
  if ( ( false === $email_error ) && ( false === $pass_error ) && ( wp_update_user( get_object_vars( $update_user ) ) ) ) {
85
- $bp->displayed_user->userdata = bp_core_get_core_userdata( $bp->displayed_user->id );
86
  $bp_settings_updated = true;
87
  }
88
 
@@ -106,6 +111,8 @@ function bp_core_screen_general_settings() {
106
 
107
  // Execute additional code
108
  do_action( 'bp_core_general_settings_after_save' );
 
 
109
  }
110
 
111
  // Load the template
24
  if ( is_super_admin() || ( !empty( $_POST['pwd'] ) && $_POST['pwd'] != '' && wp_check_password( $_POST['pwd'], $bp->displayed_user->userdata->user_pass, $bp->displayed_user->id ) ) ) {
25
 
26
  $update_user = get_userdata( $bp->displayed_user->id );
27
+
28
+ // The structure of the $update_user object changed in WP 3.3, but
29
+ // wp_update_user() still expects the old format
30
+ if ( isset( $update_user->data ) && is_object( $update_user->data ) ) {
31
+ $update_user = $update_user->data;
32
+ }
33
 
34
  // Make sure changing an email address does not already exist
35
  if ( $_POST['email'] != '' ) {
88
 
89
  // Make sure these changes are in $bp for the current page load
90
  if ( ( false === $email_error ) && ( false === $pass_error ) && ( wp_update_user( get_object_vars( $update_user ) ) ) ) {
 
91
  $bp_settings_updated = true;
92
  }
93
 
111
 
112
  // Execute additional code
113
  do_action( 'bp_core_general_settings_after_save' );
114
+
115
+ bp_core_redirect( trailingslashit( bp_displayed_user_domain() . bp_get_settings_slug() . '/general' ) );
116
  }
117
 
118
  // Load the template
bp-themes/bp-default/forums/single/edit.php DELETED
@@ -1,93 +0,0 @@
1
- <?php do_action( 'bp_before_group_forum_edit_form' ); ?>
2
-
3
- <?php if ( bp_has_forum_topic_posts() ) : ?>
4
-
5
- <form action="<?php bp_forum_topic_action(); ?>" method="post" id="forum-topic-form" class="standard-form">
6
-
7
- <div class="item-list-tabs" id="subnav" role="navigation">
8
- <ul>
9
- <li>
10
- <a href="#post-topic-reply"><?php _e( 'Reply', 'buddypress' ); ?></a>
11
- </li>
12
-
13
- <?php if ( bp_forums_has_directory() ) : ?>
14
-
15
- <li>
16
- <a href="<?php bp_forums_directory_permalink(); ?>"><?php _e( 'Forum Directory', 'buddypress'); ?></a>
17
- </li>
18
-
19
- <?php endif; ?>
20
-
21
- </ul>
22
- </div>
23
-
24
- <div id="topic-meta">
25
- <h3><?php _e( 'Edit:', 'buddypress' ); ?> <?php bp_the_topic_title(); ?> (<?php bp_the_topic_total_post_count(); ?>)</h3>
26
-
27
- <?php if ( bp_group_is_admin() || bp_group_is_mod() || bp_get_the_topic_is_mine() ) : ?>
28
-
29
- <div class="last admin-links">
30
-
31
- <?php bp_the_topic_admin_links(); ?>
32
-
33
- </div>
34
-
35
- <?php endif; ?>
36
-
37
- <?php do_action( 'bp_group_forum_topic_meta' ); ?>
38
-
39
- </div>
40
-
41
- <?php if ( bp_group_is_member() ) : ?>
42
-
43
- <?php if ( bp_is_edit_topic() ) : ?>
44
-
45
- <div id="edit-topic">
46
-
47
- <?php do_action( 'bp_group_before_edit_forum_topic' ); ?>
48
-
49
- <label for="topic_title"><?php _e( 'Title:', 'buddypress' ); ?></label>
50
- <input type="text" name="topic_title" id="topic_title" value="<?php bp_the_topic_title(); ?>" />
51
-
52
- <label for="topic_text"><?php _e( 'Content:', 'buddypress' ); ?></label>
53
- <textarea name="topic_text" id="topic_text"><?php bp_the_topic_text(); ?></textarea>
54
-
55
- <?php do_action( 'bp_group_after_edit_forum_topic' ); ?>
56
-
57
- <p class="submit"><input type="submit" name="save_changes" id="save_changes" value="<?php _e( 'Save Changes', 'buddypress' ); ?>" /></p>
58
-
59
- <?php wp_nonce_field( 'bp_forums_edit_topic' ); ?>
60
-
61
- </div>
62
-
63
- <?php else : ?>
64
-
65
- <div id="edit-post">
66
-
67
- <?php do_action( 'bp_group_before_edit_forum_post' ); ?>
68
-
69
- <textarea name="post_text" id="post_text"><?php bp_the_topic_post_edit_text(); ?></textarea>
70
-
71
- <?php do_action( 'bp_group_after_edit_forum_post' ) ?>
72
-
73
- <p class="submit"><input type="submit" name="save_changes" id="save_changes" value="<?php _e( 'Save Changes', 'buddypress' ); ?>" /></p>
74
-
75
- <?php wp_nonce_field( 'bp_forums_edit_post' ); ?>
76
-
77
- </div>
78
-
79
- <?php endif; ?>
80
-
81
- <?php endif; ?>
82
-
83
- </form><!-- #forum-topic-form -->
84
-
85
- <?php else: ?>
86
-
87
- <div id="message" class="info">
88
- <p><?php _e( 'This topic does not exist.', 'buddypress' ); ?></p>
89
- </div>
90
-
91
- <?php endif;?>
92
-
93
- <?php do_action( 'bp_after_group_forum_edit_form' ); ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
bp-themes/bp-default/forums/single/forum-header.php DELETED
@@ -1,35 +0,0 @@
1
- <?php do_action( 'bp_before_forum_header' ); ?>
2
-
3
- <div id="item-header-avatar">
4
- <a href="<?php bp_forum_permalink(); ?>" title="<?php bp_get_forum_name(); ?>">
5
-
6
- <?php //bp_forum_avatar(); ?>
7
-
8
- </a>
9
- </div><!-- #item-header-avatar -->
10
-
11
- <div id="item-header-content">
12
- <h2><a href="<?php bp_forum_permalink(); ?>" title="<?php bp_forum_name(); ?>"><?php bp_forum_name(); ?></a></h2>
13
- <span class="highlight"><?php //bp_forum_type(); ?></span> <span class="activity"><?php printf( __( 'active %s', 'buddypress' ), '' ); //bp_get_forum_last_active() ); ?></span>
14
-
15
- <?php do_action( 'bp_before_forum_header_meta' ); ?>
16
-
17
- <div id="item-meta">
18
-
19
- <?php //bp_forum_description(); ?>
20
-
21
- <div id="item-buttons">
22
-
23
- <?php do_action( 'bp_forum_header_actions' ); ?>
24
-
25
- </div><!-- #item-buttons -->
26
-
27
- <?php do_action( 'bp_forum_header_meta' ); ?>
28
-
29
- </div>
30
- </div><!-- #item-header-content -->
31
-
32
- <?php
33
- do_action( 'bp_after_forum_header' );
34
- do_action( 'template_notices' );
35
- ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
bp-themes/bp-default/forums/single/forum.php DELETED
@@ -1,65 +0,0 @@
1
- <?php get_header( 'buddypress' ); ?>
2
-
3
- <div id="content">
4
- <div class="padder">
5
-
6
- <?php do_action( 'bp_before_directory_forums_content' ); ?>
7
-
8
- <div id="item-header" role="complementary">
9
-
10
- <?php locate_template( array( 'forums/single/forum-header.php' ), true ); ?>
11
-
12
- </div><!-- #item-header -->
13
-
14
- <div id="item-nav">
15
- <div class="item-list-tabs no-ajax" id="subnav" role="navigation">
16
- <ul>
17
-
18
- <li>
19
- <a href="#post-new" class="show-hide-new"><?php _e( 'New Topic', 'buddypress' ); ?></a>
20
- </li>
21
-
22
- <?php if ( bp_forums_has_directory() ) : ?>
23
-
24
- <li>
25
- <a href="<?php bp_forums_directory_permalink() ?>"><?php _e( 'Forum Directory', 'buddypress'); ?></a>
26
- </li>
27
-
28
- <?php endif; ?>
29
-
30
- <?php do_action( 'bp_forums_directory_group_sub_types' ); ?>
31
-
32
- <li id="forums-order-select" class="last filter">
33
-
34
- <label for="forums-order-by"><?php _e( 'Order By:', 'buddypress' ); ?></label>
35
- <select id="forums-order-by">
36
- <option value="active"><?php _e( 'Last Active', 'buddypress' ); ?></option>
37
- <option value="popular"><?php _e( 'Most Posts', 'buddypress' ); ?></option>
38
- <option value="unreplied"><?php _e( 'Unreplied', 'buddypress' ); ?></option>
39
-
40
- <?php do_action( 'bp_forums_directory_order_options' ); ?>
41
-
42
- </select>
43
- </li>
44
- </ul>
45
- </div>
46
- </div><!-- #item-nav -->
47
-
48
- <div id="item-body">
49
-
50
- <div id="forums-dir-list" class="forums dir-list" role="main">
51
-
52
- <?php locate_template( array( 'forums/forums-loop.php' ), true ); ?>
53
-
54
- </div>
55
-
56
- <?php do_action( 'bp_directory_forums_content' ); ?>
57
-
58
- </div>
59
- </div><!-- #new-topic-post -->
60
- </div><!-- .padder -->
61
-
62
- <?php do_action( 'bp_after_directory_forums_content' ); ?>
63
-
64
- <?php get_sidebar( 'buddypress' ); ?>
65
- <?php get_footer( 'buddypress' ); ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
bp-themes/bp-default/forums/single/topic.php DELETED
@@ -1,197 +0,0 @@
1
- <?php get_header( 'buddypress' ); ?>
2
-
3
- <div id="content">
4
- <div class="padder">
5
-
6
- <?php do_action( 'bp_before_group_home_content' ) ?>
7
-
8
- <?php if ( bp_has_forum_topic_posts() ) : ?>
9
-
10
- <div id="item-header" role="complementary">
11
-
12
- <?php locate_template( array( 'forums/single/forum-header.php' ), true ); ?>
13
-
14
- </div><!-- #item-header -->
15
-
16
- <div id="item-nav">
17
- <div class="item-list-tabs no-ajax" id="object-nav" role="navigation">
18
- <ul>
19
-
20
- <?php bp_get_options_nav(); ?>
21
-
22
- <?php do_action( 'bp_forum_options_nav' ); ?>
23
-
24
- </ul>
25
- </div>
26
- </div><!-- #item-nav -->
27
-
28
- <div id="item-body">
29
-
30
- <?php do_action( 'bp_before_group_forum_topic' ); ?>
31
-
32
- <form action="<?php bp_forum_topic_action() ?>" method="post" id="forum-topic-form" class="standard-form">
33
-
34
- <div class="item-list-tabs no-ajax" id="subnav" role="navigation">
35
- <ul>
36
- <?php if ( is_user_logged_in() ) : ?>
37
- <li>
38
- <a href="#post-topic-reply" class="show-hide-new"><?php _e( 'New Reply', 'buddypress' ) ?></a>
39
- </li>
40
- <?php endif; ?>
41
-
42
- <?php if ( bp_forums_has_directory() ) : ?>
43
-
44
- <li>
45
- <a href="<?php bp_forums_directory_permalink() ?>"><?php _e( 'Forum Directory', 'buddypress') ?></a>
46
- </li>
47
-
48
- <?php endif; ?>
49
-
50
- </ul>
51
- </div>
52
-
53
- <div id="topic-meta">
54
- <h3><?php bp_the_topic_title() ?> (<?php bp_the_topic_total_post_count() ?>)</h3>
55
-
56
- <?php if ( is_super_admin() || current_user_can( 'moderate' ) ) : ?>
57
-
58
- <div class="last admin-links">
59
-
60
- <?php bp_the_topic_admin_links(); ?>
61
-
62
- </div>
63
-
64
- <?php endif; ?>
65
-
66
- <?php do_action( 'bp_group_forum_topic_meta' ); ?>
67
-
68
- </div>
69
-
70
- <div class="pagination no-ajax">
71
-
72
- <div id="post-count-top" class="pag-count">
73
-
74
- <?php bp_the_topic_pagination_count() ?>
75
-
76
- </div>
77
-
78
- <div class="pagination-links" id="topic-pag-top">
79
-
80
- <?php bp_the_topic_pagination() ?>
81
-
82
- </div>
83
-
84
- </div>
85
-
86
- <?php do_action( 'bp_before_group_forum_topic_posts' ) ?>
87
-
88
- <ul id="topic-post-list" class="item-list" role="main">
89
- <?php while ( bp_forum_topic_posts() ) : bp_the_forum_topic_post(); ?>
90
-
91
- <li id="post-<?php bp_the_topic_post_id() ?>" class="<?php bp_the_topic_post_css_class() ?>">
92
- <div class="poster-meta">
93
- <a href="<?php bp_the_topic_post_poster_link() ?>">
94
-
95
- <?php bp_the_topic_post_poster_avatar( 'width=40&height=40' ); ?>
96
-
97
- </a>
98
-
99
- <?php echo sprintf( __( '%s said %s ago:', 'buddypress' ), bp_get_the_topic_post_poster_name(), bp_get_the_topic_post_time_since() ) ?>
100
-
101
- </div>
102
-
103
- <div class="post-content">
104
-
105
- <?php bp_the_topic_post_content() ?>
106
-
107
- </div>
108
-
109
- <div class="admin-links">
110
-
111
- <?php if ( is_super_admin() || current_user_can( 'moderate' ) ) : ?>
112
-
113
- <?php bp_the_topic_post_admin_links() ?>
114
-
115
- <?php endif; ?>
116
-
117
- <?php do_action( 'bp_group_forum_post_meta' ); ?>
118
-
119
- <a href="#post-<?php bp_the_topic_post_id() ?>" title="<?php _e( 'Permanent link to this post', 'buddypress' ) ?>">#</a>
120
- </div>
121
- </li>
122
-
123
- <?php endwhile; ?>
124
- </ul><!-- #topic-post-list -->
125
-
126
- <?php do_action( 'bp_after_group_forum_topic_posts' ) ?>
127
-
128
- <div class="pagination no-ajax">
129
-
130
- <div id="post-count-bottom" class="pag-count">
131
-
132
- <?php bp_the_topic_pagination_count() ?>
133
-
134
- </div>
135
-
136
- <div class="pagination-links" id="topic-pag-bottom">
137
-
138
- <?php bp_the_topic_pagination() ?>
139
-
140
- </div>
141
-
142
- </div>
143
-
144
- <?php if ( is_user_logged_in() ) : ?>
145
-
146
- <?php if ( bp_get_the_topic_is_last_page() ) : ?>
147
-
148
- <?php if ( bp_get_the_topic_is_topic_open() ) : ?>
149
-
150
- <div id="post-topic-reply">
151
- <p id="post-reply"></p>
152
-
153
- <?php do_action( 'groups_forum_new_reply_before' ) ?>
154
-
155
- <h4><?php _e( 'Add a reply:', 'buddypress' ) ?></h4>
156
-
157
- <textarea name="reply_text" id="reply_text"></textarea>
158
-
159
- <div class="submit">
160
- <input type="submit" name="submit_reply" id="submit" value="<?php _e( 'Post Reply', 'buddypress' ) ?>" />
161
- </div>
162
-
163
- <?php do_action( 'groups_forum_new_reply_after' ) ?>
164
-
165
- <?php wp_nonce_field( 'bp_forums_new_reply' ) ?>
166
- </div>
167
-
168
- <?php else : ?>
169
-
170
- <div id="message" class="info">
171
- <p><?php _e( 'This topic is closed, replies are no longer accepted.', 'buddypress' ) ?></p>
172
- </div>
173
-
174
- <?php endif; ?>
175
-
176
- <?php endif; ?>
177
-
178
- <?php endif; ?>
179
-
180
- </form><!-- #forum-topic-form -->
181
- </div>
182
-
183
- <?php else: ?>
184
-
185
- <div id="message" class="info">
186
- <p><?php _e( 'There are no posts for this topic.', 'buddypress' ) ?></p>
187
- </div>
188
-
189
- <?php endif;?>
190
-
191
- </div>
192
- </div>
193
-
194
- <?php do_action( 'bp_after_group_forum_topic' ) ?>
195
-
196
- <?php get_sidebar( 'buddypress' ); ?>
197
- <?php get_footer( 'buddypress' ); ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
bp-themes/bp-default/functions.php CHANGED
@@ -139,7 +139,7 @@ if ( !function_exists( 'bp_dtheme_enqueue_scripts' ) ) :
139
  */
140
  function bp_dtheme_enqueue_scripts() {
141
  // Bump this when changes are made to bust cache
142
- $version = '20111013';
143
 
144
  // Enqueue the global JS - Ajax will not work without it
145
  wp_enqueue_script( 'dtheme-ajax-js', get_template_directory_uri() . '/_inc/global.js', array( 'jquery' ), $version );
@@ -182,7 +182,7 @@ if ( !function_exists( 'bp_dtheme_enqueue_styles' ) ) :
182
  function bp_dtheme_enqueue_styles() {
183
 
184
  // Bump this when changes are made to bust cache
185
- $version = '20111013';
186
 
187
  // Register our main stylesheet
188
  wp_register_style( 'bp-default-main', get_template_directory_uri() . '/_inc/css/default.css', array(), $version );
139
  */
140
  function bp_dtheme_enqueue_scripts() {
141
  // Bump this when changes are made to bust cache
142
+ $version = '20120110';
143
 
144
  // Enqueue the global JS - Ajax will not work without it
145
  wp_enqueue_script( 'dtheme-ajax-js', get_template_directory_uri() . '/_inc/global.js', array( 'jquery' ), $version );
182
  function bp_dtheme_enqueue_styles() {
183
 
184
  // Bump this when changes are made to bust cache
185
+ $version = '20120110';
186
 
187
  // Register our main stylesheet
188
  wp_register_style( 'bp-default-main', get_template_directory_uri() . '/_inc/css/default.css', array(), $version );
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.5.2
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.5.3.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.5.2
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.5.3.1
6
  * Author: the BuddyPress team
7
  * Author URI: http://buddypress.org
8
  * License: GNU General Public License
bp-xprofile/bp-xprofile-classes.php CHANGED
@@ -748,7 +748,7 @@ Class BP_XProfile_Field {
748
  </select>
749
  </div>
750
 
751
- <?php do_action( 'xprofile_field_additional_options', &$this ) ?>
752
 
753
  <?php $this->render_admin_form_children(); ?>
754
  <?php } else { ?>
748
  </select>
749
  </div>
750
 
751
+ <?php do_action( 'xprofile_field_additional_options', $this ) ?>
752
 
753
  <?php $this->render_admin_form_children(); ?>
754
  <?php } else { ?>
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 </