Ticket #15058: 15058.3.diff

src/wp-includes/option.php

@@ -250 +250 @@
 function update_option( $option, $value, $autoload = null ) {
         global $wpdb;
 
-        $option = trim($option);
-        if ( empty($option) )
+        $option = trim( $option );
+
+        if ( empty( $option ) ) {
                 return false;
+        }
 
+        if ( 191 < strlen( $option ) ) {
+                _doing_it_wrong( __FUNCTION__, __( 'The option name is longer than what can be stored in the options table.' ), '4.5' );
+        }
+
         wp_protect_special_option( $option );
 
         if ( is_object( $value ) )
@@ -395 +401 @@
 function add_option( $option, $value = '', $deprecated = '', $autoload = 'yes' ) {
         global $wpdb;
 
-        if ( !empty( $deprecated ) )
+        if ( !empty( $deprecated ) ) {
                 _deprecated_argument( __FUNCTION__, '2.3' );
+        }
 
-        $option = trim($option);
-        if ( empty($option) )
+        $option = trim( $option );
+        
+        if ( empty( $option ) ) {
                 return false;
+        }
 
+        if ( 191 < strlen( $option ) ) {
+                _doing_it_wrong( __FUNCTION__, __( 'The option name is longer than what can be stored in the options table.' ), '4.5' );
+        }
+
         wp_protect_special_option( $option );
 
         if ( is_object($value) )
@@ -713 +726 @@
         } else {
                 $transient_timeout = '_transient_timeout_' . $transient;
                 $transient_option = '_transient_' . $transient;
+
+                if ( 191 < strlen( $transient_option ) || 191 < strlen( $transient_timeout ) ) {
+                        _doing_it_wrong( __FUNCTION__, __( 'The transient name is longer than what can be stored in the options table.' ), '4.5' );
+                }
+
                 if ( false === get_option( $transient_option ) ) {
                         $autoload = 'yes';
                         if ( $expiration ) {