Changeset 3829

Timestamp:

03/31/2012 07:22:29 AM (14 years ago)

Author:

johnjamesjacoby

Message:

PHP5'ize bbp-core-classes.php.

File:

• branches/plugin/bbp-includes/bbp-core-classes.php (modified) (20 diffs)

branches/plugin/bbp-includes/bbp-core-classes.php

@@ -53 +53 @@
     var $current_id;
 
+
+    /** Methods ***************************************************************/
 
     /**
@@ -69 +71 @@
      * @uses BBP_Component::setup_actions() Setup the hooks and actions
      */
-    function BBP_Component( $args = '' ) {
+    public function __construct( $args = '' ) {
         if ( empty( $args ) )
             return;
@@ -87 +89 @@
      * @uses apply_filters() Calls 'bbp_{@link BBP_Component::name}_slug'
      */
-    function setup_globals( $args = '' ) {
+    private function setup_globals( $args = '' ) {
         $this->name = $args['name'];
         $this->id   = apply_filters( 'bbp_' . $this->name . '_id',   $args['id']   );
@@ -101 +103 @@
      * @uses do_action() Calls 'bbp_{@link BBP_Component::name}includes'
      */
-    function includes() {
+    private function includes() {
         do_action( 'bbp_' . $this->name . 'includes' );
     }
@@ -115 +117 @@
      *                    'bbp_{@link BBP_Component::name}setup_actions'
      */
-    function setup_actions() {
+    private function setup_actions() {
         add_action( 'bbp_register_post_types',    array( $this, 'register_post_types'    ), 10, 2 ); // Register post types
         add_action( 'bbp_register_taxonomies',    array( $this, 'register_taxonomies'    ), 10, 2 ); // Register taxonomies
@@ -132 +134 @@
      * @uses do_action() Calls 'bbp_{@link BBP_Component::name}_register_post_types'
      */
-    function register_post_types() {
+    public function register_post_types() {
         do_action( 'bbp_' . $this->name . '_register_post_types' );
     }
@@ -143 +145 @@
      * @uses do_action() Calls 'bbp_{@link BBP_Component::name}_register_taxonomies'
      */
-    function register_taxonomies() {
+    public function register_taxonomies() {
         do_action( 'bbp_' . $this->name . '_register_taxonomies' );
     }
@@ -154 +156 @@
      * @uses do_action() Calls 'bbp_{@link BBP_Component::name}_add_rewrite_tags'
      */
-    function add_rewrite_tags() {
+    public function add_rewrite_tags() {
         do_action( 'bbp_' . $this->name . '_add_rewrite_tags' );
     }
@@ -165 +167 @@
      * @uses do_action() Calls 'bbp_{@link BBP_Component::name}_generate_rewrite_rules'
      */
-    function generate_rewrite_rules( $wp_rewrite ) {
+    public function generate_rewrite_rules( $wp_rewrite ) {
         do_action_ref_array( 'bbp_' . $this->name . '_generate_rewrite_rules', $wp_rewrite );
     }
@@ -183 +185 @@
  */
 class BBP_Walker_Forum extends Walker {
+
     /**
      * @see Walker::$tree_type
@@ -201 +204 @@
     var $db_fields = array( 'parent' => 'post_parent', 'id' => 'ID' );
 
+    /** Methods ***************************************************************/
+
     /**
      * Set the tree_type
@@ -206 +211 @@
      * @since bbPress (r2514)
      */
-    function BBP_Walker_Forum() {
+    public function __construct() {
         $this->tree_type = bbp_get_forum_post_type();
     }
@@ -219 +224 @@
      * @param int $depth Depth of page. Used for padding.
      */
-    function start_lvl( &$output, $depth ) {
+    public function start_lvl( &$output, $depth ) {
         $indent  = str_repeat( "\t", $depth );
         $output .= "\n$indent<ul class='children'>\n";
@@ -233 +238 @@
      * @param int $depth Depth of page. Used for padding.
      */
-    function end_lvl( &$output, $depth ) {
+    public function end_lvl( &$output, $depth ) {
         $indent  = str_repeat( "\t", $depth );
         $output .= "$indent</ul>\n";
@@ -250 +255 @@
      * @param array $args
      */
-    function start_el( &$output, $forum, $depth, $args, $current_forum ) {
+    public function start_el( &$output, $forum, $depth, $args, $current_forum ) {
 
         $indent = $depth ? str_repeat( "\t", $depth ) : '';
@@ -291 +296 @@
      * @param int $depth Depth of page. Not Used.
      */
-    function end_el( &$output, $forum, $depth ) {
+    public function end_el( &$output, $forum, $depth ) {
         $output .= "</li>\n";
     }
@@ -306 +311 @@
  */
 class BBP_Walker_Dropdown extends Walker {
+
     /**
      * @see Walker::$tree_type
@@ -324 +330 @@
     var $db_fields = array( 'parent' => 'post_parent', 'id' => 'ID' );
 
+    /** Methods ***************************************************************/
+
     /**
      * Set the tree_type
@@ -329 +337 @@
      * @since bbPress (r2746)
      */
-    function BBP_Walker_Dropdown() {
+    public function __construct() {
         $this->tree_type = bbp_get_forum_post_type();
     }
@@ -352 +360 @@
      *                        title, output, post, depth and args
      */
-    function start_el( &$output, $_post, $depth, $args ) {
+    public function start_el( &$output, $_post, $depth, $args ) {
         $pad     = str_repeat( '&nbsp;', $depth * 3 );
         $output .= "\t<option class=\"level-$depth\"";