Changeset 6121

Timestamp:

06/19/2012 01:27:00 PM (14 years ago)

Author:

boonebgorges

Message:

Removes static and access declarations on methods in bp-core-classes.php

See #4274 and r6119

File:

• trunk/bp-core/bp-core-classes.php (modified) (25 diffs)

trunk/bp-core/bp-core-classes.php

@@ -125 +125 @@
      * @param boolean $populate_extras Whether to fetch extra information such as group/friendship counts or not.
      */
-    public function __construct( $user_id, $populate_extras = false ) {
+    function __construct( $user_id, $populate_extras = false ) {
         if ( !empty( $user_id ) ) {
             $this->id = $user_id;
@@ -148 +148 @@
      * @uses bp_profile_last_updated_date() Returns the last updated date for a user.
      */
-    private function populate() {
+    function populate() {
 
         if ( bp_is_active( 'xprofile' ) )
@@ -181 +181 @@
      * Populates extra fields such as group and friendship counts.
      */
-    private function populate_extras() {
+    function populate_extras() {
 
         if ( bp_is_active( 'friends' ) ) {
@@ -193 +193 @@
     }
 
-    private function get_profile_data() {
+    function get_profile_data() {
         return BP_XProfile_ProfileData::get_all_for_user( $this->id );
     }
@@ -199 +199 @@
     /** Static Methods ********************************************************/
 
-    public static function get_users( $type, $limit = 0, $page = 1, $user_id = 0, $include = false, $search_terms = false, $populate_extras = true, $exclude = false, $meta_key = false, $meta_value = false ) {
+    function get_users( $type, $limit = 0, $page = 1, $user_id = 0, $include = false, $search_terms = false, $populate_extras = true, $exclude = false, $meta_key = false, $meta_value = false ) {
         global $wpdb, $bp;
 
@@ -392 +392 @@
      * @static
      */
-    public static function get_users_by_letter( $letter, $limit = null, $page = 1, $populate_extras = true, $exclude = '' ) {
+    function get_users_by_letter( $letter, $limit = null, $page = 1, $populate_extras = true, $exclude = '' ) {
         global $bp, $wpdb;
 
@@ -454 +454 @@
      * @static
      */
-    public static function get_specific_users( $user_ids, $limit = null, $page = 1, $populate_extras = true ) {
+    function get_specific_users( $user_ids, $limit = null, $page = 1, $populate_extras = true ) {
         global $wpdb;
 
@@ -499 +499 @@
      * @static
      */
-    public static function search_users( $search_terms, $limit = null, $page = 1, $populate_extras = true ) {
+    function search_users( $search_terms, $limit = null, $page = 1, $populate_extras = true ) {
         global $bp, $wpdb;
 
@@ -543 +543 @@
      * @static
      */
-    public static function get_user_extras( &$paged_users, &$user_ids, $type = false ) {
+    function get_user_extras( &$paged_users, &$user_ids, $type = false ) {
         global $bp, $wpdb;
 
@@ -623 +623 @@
      * @static
      */
-    public static function get_core_userdata( $user_id ) {
+    function get_core_userdata( $user_id ) {
         global $wpdb;
 
@@ -706 +706 @@
      * @param integer $id
      */
-    public function __construct( $id = 0 ) {
+    function __construct( $id = 0 ) {
         if ( !empty( $id ) ) {
             $this->id = $id;
@@ -720 +720 @@
      * @return bool Success or failure
      */
-    public function save() {
+    function save() {
         global $bp, $wpdb;
 
@@ -748 +748 @@
      * @global wpdb $wpdb WordPress database object
      */
-    private function populate() {
+    function populate() {
         global $bp, $wpdb;
 
@@ -764 +764 @@
     /** Static Methods ********************************************************/
 
-    public static function check_access( $user_id, $notification_id ) {
+    function check_access( $user_id, $notification_id ) {
         global $wpdb, $bp;
 
@@ -780 +780 @@
      * @static
      */
-    public static function get_all_for_user( $user_id, $status = 'is_new' ) {
+    function get_all_for_user( $user_id, $status = 'is_new' ) {
         global $bp, $wpdb;
 
@@ -798 +798 @@
      * @static
      */
-    public static function delete_for_user_by_type( $user_id, $component_name, $component_action ) {
+    function delete_for_user_by_type( $user_id, $component_name, $component_action ) {
         global $bp, $wpdb;
 
@@ -816 +816 @@
      * @static
      */
-    public static function delete_for_user_by_item_id( $user_id, $item_id, $component_name, $component_action, $secondary_item_id = false ) {
+    function delete_for_user_by_item_id( $user_id, $item_id, $component_name, $component_action, $secondary_item_id = false ) {
         global $bp, $wpdb;
 
@@ -834 +834 @@
      * @static
      */
-    public static function delete_from_user_by_type( $user_id, $component_name, $component_action ) {
+    function delete_from_user_by_type( $user_id, $component_name, $component_action ) {
         global $bp, $wpdb;
 
@@ -851 +851 @@
      * @static
      */
-    public static function delete_all_by_type( $item_id, $component_name, $component_action, $secondary_item_id ) {
+    function delete_all_by_type( $item_id, $component_name, $component_action, $secondary_item_id ) {
         global $bp, $wpdb;
 
@@ -1003 +1003 @@
      * @return bool False if not allowed
      */
-    public function __construct( $args = '' ) {
+    function __construct( $args = '' ) {
 
         // Default arguments
@@ -1107 +1107 @@
      * @return string
      */
-    public function contents() {
+    function contents() {
         return $this->contents;
     }
@@ -1116 +1116 @@
      * Output contents of button
      */
-    public function display() {
+    function display() {
         if ( !empty( $this->contents ) )
             echo $this->contents;
@@ -1138 +1138 @@
      * @global unknown $wp_embed
      */
-    public function __construct() {
+    function __construct() {
         global $wp_embed;
 
@@ -1187 +1187 @@
      * @return string The embed HTML on success, otherwise the original URL.
      */
-    public function shortcode( $attr, $url = '' ) {
+    function shortcode( $attr, $url = '' ) {
         if ( empty( $url ) )
             return '';
@@ -1252 +1252 @@
      * @return string The embed HTML on success, otherwise the original URL.
      */
-    public function parse_oembed( $id, $url, $attr, $rawattr ) {
+    function parse_oembed( $id, $url, $attr, $rawattr ) {
         $id = intval( $id );