Ticket #2227: 2227.diff

includes/topics/template-tags.php

@@ -2893 +2893 @@
         $sticky_statuses = array (
                 'unstick' => $r['unstick_text'],
                 'stick'   => $r['stick_text'],
-                'super'   => $r['super_text'],
-        ); ?>
+        ); 
+        if( !empty( $r['super_text'] ) )
+                $sticky_statuses['super'] = $r['super_text']; ?>
 
         <select name="<?php echo $select_id; ?>" id="<?php echo $select_id; ?>"<?php echo $tab; ?>>
 

includes/extend/buddypress/group.php

@@ -626 +626 @@
 
                                 case false  :
                                 case 'page' :
+                                
+                                        // strip the super stickies from topic query
+                                        add_filter( 'bbp_get_super_stickies', array( $this, 'strip_super_stickies_from_topic_query' ), 10, 1 );
+                                        
+                                        // unset the choice super sticky on topic form
+                                        add_filter( 'bbp_after_topic_type_select_parse_args', array( $this, 'unset_super_sticky' ), 10, 1 );
 
                                         // Query forums and show them if they exist
                                         if ( bbp_forums() ) :
@@ -651 +657 @@
                                 /** Single Topic **********************************************/
 
                                 case $this->topic_slug :
+                                
+                                        // hide the 'to front' admin links
+                                        add_filter( 'bbp_get_topic_stick_link', array( $this, 'hide_super_sticky_admin_link' ), 10, 2 );
 
                                         // Get the topic
                                         bbp_has_topics( array(
                                                 'name'           => bp_action_variable( $offset + 1 ),
-                                                'posts_per_page' => 1
+                                                'posts_per_page' => 1,
+                                                'show_stickies'  => false
                                         ) );
 
                                         // If no topic, 404
@@ -675 +685 @@
 
                                         // Topic edit
                                         if ( bp_action_variable( $offset + 2 ) == bbp_get_edit_rewrite_id() ) :
+                                        
+                                                // unset the choice super sticky on edit topic template
+                                                add_filter( 'bbp_after_topic_type_select_parse_args', array( $this, 'unset_super_sticky' ), 10, 1 );
 
                                                 // Set the edit switches
                                                 $wp_query->bbp_is_edit       = true;
@@ -763 +776 @@
                 // Allow actions immediately after group forum output
                 do_action( 'bbp_after_group_forum_display' );
         }
+        
+        /** Super sticky filters ***************************************************/
+        
+        /**
+         * Strip super stickies from the topic query
+         *
+         * @param array $super the super stickies
+         * @return array (empty) 
+         */
+        public function strip_super_stickies_from_topic_query( $super ) {
+                return array();
+        }
+        
+        /**
+         * Unset the type super sticky from topic type
+         *
+         * @param array $args
+         * @return array $args ( - the super sticky choice ) 
+         */
+        public function unset_super_sticky( $args ) {
+                unset( $args['super_text'] );
+                return $args;
+        }
+        
+        /**
+         * Ugly preg_replace to hide the to front admin link
+         *
+         * @param str $retval
+         * @param array $args
+         * @return str $retval ( - the to front link ) 
+         */
+        public function hide_super_sticky_admin_link( $retval, $args ) {
+                if( strpos( $retval, '(' ) )
+                        $retval = preg_replace( '/(\(.+?)+(\))/i', '', $retval );
+                
+                return $retval;
+        }
 
         /** Redirect Helpers ******************************************************/