Changeset 5021

Timestamp:

07/10/2013 03:29:03 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Use string values when comparing against super globals. Regression introduced in r4995. See #2358.

Location:

trunk/includes

Files:

• admin/topics.php (modified) (1 diff)
• forums/functions.php (modified) (1 diff)
• replies/functions.php (modified) (1 diff)
• topics/functions.php (modified) (8 diffs)

trunk/includes/admin/topics.php

@@ -502 +502 @@
 
                     $is_sticky = bbp_is_topic_sticky( $topic_id );
-                    $is_super  = ( empty( $is_sticky ) && !empty( $_GET['super'] ) && 1 === (int) $_GET['super'] ) ? true : false;
-                    $message   = true === $is_sticky ? 'unsticked'     : 'sticked';
-                    $message   = true === $is_super  ? 'super_sticked' : $message;
-                    $success   = true === $is_sticky ? bbp_unstick_topic( $topic_id ) : bbp_stick_topic( $topic_id, $is_super );
+                    $is_super  = false === $is_sticky && !empty( $_GET['super'] ) && ( "1" === $_GET['super'] ) ? true : false;
+                    $message   = true  === $is_sticky ? 'unsticked'     : 'sticked';
+                    $message   = true  === $is_super  ? 'super_sticked' : $message;
+                    $success   = true  === $is_sticky ? bbp_unstick_topic( $topic_id ) : bbp_stick_topic( $topic_id, $is_super );
 
                     break;

trunk/includes/forums/functions.php

@@ -509 +509 @@
 
     // Update revision log
-    if ( !empty( $_POST['bbp_log_forum_edit'] ) && ( 1 === $_POST['bbp_log_forum_edit'] ) && ( $revision_id = wp_save_post_revision( $forum_id ) ) ) {
+    if ( !empty( $_POST['bbp_log_forum_edit'] ) && ( "1" === $_POST['bbp_log_forum_edit'] ) && ( $revision_id = wp_save_post_revision( $forum_id ) ) ) {
         bbp_update_forum_revision_log( array(
             'forum_id'    => $forum_id,

trunk/includes/replies/functions.php

@@ -713 +713 @@
 
     // Update revision log
-    if ( !empty( $_POST['bbp_log_reply_edit'] ) && ( 1 === $_POST['bbp_log_reply_edit'] ) ) {
+    if ( !empty( $_POST['bbp_log_reply_edit'] ) && ( "1" === $_POST['bbp_log_reply_edit'] ) ) {
         $revision_id = wp_save_post_revision( $reply_id );
         if ( !empty( $revision_id ) ) {

trunk/includes/topics/functions.php

@@ -690 +690 @@
 
         // Update revision log
-        if ( !empty( $_POST['bbp_log_topic_edit'] ) && ( 1 === $_POST['bbp_log_topic_edit'] ) )  {
+        if ( !empty( $_POST['bbp_log_topic_edit'] ) && ( "1" === $_POST['bbp_log_topic_edit'] ) )  {
             $revision_id = wp_save_post_revision( $topic_id );
             if ( ! empty( $revision_id ) ) {
@@ -1211 +1211 @@
 
             // Shift the subscriber if told to
-            if ( !empty( $_POST['bbp_topic_subscribers'] ) && ( 1 === $_POST['bbp_topic_subscribers'] ) && bbp_is_subscriptions_active() )
+            if ( !empty( $_POST['bbp_topic_subscribers'] ) && ( "1" === $_POST['bbp_topic_subscribers'] ) && bbp_is_subscriptions_active() )
                 bbp_add_user_subscription( $subscriber, $destination_topic->ID );
 
@@ -1231 +1231 @@
 
             // Shift the favoriter if told to
-            if ( !empty( $_POST['bbp_topic_favoriters'] ) && 1 === $_POST['bbp_topic_favoriters'] )
+            if ( !empty( $_POST['bbp_topic_favoriters'] ) && "1" === $_POST['bbp_topic_favoriters'] )
                 bbp_add_user_favorite( $favoriter, $destination_topic->ID );
 
@@ -1248 +1248 @@
 
         // Shift the tags if told to
-        if ( !empty( $_POST['bbp_topic_tags'] ) && ( 1 === $_POST['bbp_topic_tags'] ) )
+        if ( !empty( $_POST['bbp_topic_tags'] ) && ( "1" === $_POST['bbp_topic_tags'] ) )
             wp_set_post_terms( $destination_topic->ID, $source_topic_tags, bbp_get_topic_tag_tax_id(), true );
 
@@ -1562 +1562 @@
 
     // Copy the subscribers
-    if ( !empty( $_POST['bbp_topic_subscribers'] ) && 1 === $_POST['bbp_topic_subscribers'] && bbp_is_subscriptions_active() ) {
+    if ( !empty( $_POST['bbp_topic_subscribers'] ) && "1" === $_POST['bbp_topic_subscribers'] && bbp_is_subscriptions_active() ) {
 
         // Get the subscribers
@@ -1579 +1579 @@
 
     // Copy the favoriters if told to
-    if ( !empty( $_POST['bbp_topic_favoriters'] ) && 1 === $_POST['bbp_topic_favoriters'] ) {
+    if ( !empty( $_POST['bbp_topic_favoriters'] ) && ( "1" === $_POST['bbp_topic_favoriters'] ) ) {
 
         // Get the favoriters
@@ -1596 +1596 @@
 
     // Copy the tags if told to
-    if ( !empty( $_POST['bbp_topic_tags'] ) && ( 1 === $_POST['bbp_topic_tags'] ) ) {
+    if ( !empty( $_POST['bbp_topic_tags'] ) && ( "1" === $_POST['bbp_topic_tags'] ) ) {
 
         // Get the source topic tags
@@ -2067 +2067 @@
 
             $is_sticky = bbp_is_topic_sticky( $topic_id );
-            $is_super  = ( empty( $is_sticky ) && !empty( $_GET['super'] ) && 1 === (int) $_GET['super'] ) ? true : false;
+            $is_super  = ( empty( $is_sticky ) && !empty( $_GET['super'] ) && "1" === $_GET['super'] ) ? true : false;
             $success   = $is_sticky ? bbp_unstick_topic( $topic_id ) : bbp_stick_topic( $topic_id, $is_super );
             $failure   = $is_sticky ? __( '<strong>ERROR</strong>: There was a problem unsticking the topic.', 'bbpress' ) : __( '<strong>ERROR</strong>: There was a problem sticking the topic.', 'bbpress' );