Changeset 6820 for trunk/src/includes/admin/classes/class-bbp-converter.php

Timestamp:

05/27/2018 02:15:00 AM (7 years ago)

Author:

johnjamesjacoby

Message:

Converter: remove safe_mode check from BBP_Converter::maybe_set_memory().

This was deprecated in PHP 5.3.0 and removed in 5.4.0. Instead, this change employs the following:

• Moves keys and values into a filterable array
• Looks for disabled functions and avoids them
• Adds error control operators as needed

File:

• trunk/src/includes/admin/classes/class-bbp-converter.php (modified) (1 diff)

trunk/src/includes/admin/classes/class-bbp-converter.php

@@ -250 +250 @@
      */
     private function maybe_set_memory() {
-        if ( ! ini_get( 'safe_mode' ) ) {
-            set_time_limit( 0 );
-            ini_set( 'memory_limit',   '256M' );
-            ini_set( 'implicit_flush', '1'    );
-            ignore_user_abort( true );
+
+        // Filter args
+        $r = apply_filters( 'bbp_converter_php_ini_overrides', array(
+            'implicit_flush'     => '1',
+            'memory_limit'       => '256M',
+            'max_execution_time' => HOUR_IN_SECONDS * 6
+        ) );
+
+        // Get disabled PHP functions (to avoid using them)
+        $disabled = explode( ',', @ini_get( 'disable_functions' ) );
+
+        // Maybe avoid terminating when the client goes away (if function is not disabled)
+        if ( ! in_array( 'ignore_user_abort', $disabled, true ) ) {
+            @ignore_user_abort( true );
+        }
+
+        // Maybe set memory & time limits, and flush style (if function is not disabled)
+        if ( ! in_array( 'ini_set', $disabled, true ) ) {
+            foreach ( $r as $key => $value ) {
+                @ini_set( $key, $value );
+            }
         }
     }