Maintenance changes from PR on original [scribu#60]

Contributors:
- dikiyforester
- meloniq
- squigglybob

Author: dustyf

AdminPage.php

@@ -135,7 +135,7 @@ public function __construct( $file = false, $options = null ) {
 		}
 
 		add_action( 'admin_menu', array( $this, 'page_init' ), $this->args['admin_action_priority'] );
-		add_filter( 'contextual_help', array( $this, '_contextual_help' ), 10, 2 );
+		add_action( 'current_screen', array( $this, '_contextual_help_compat' ) );
 
 		if ( $file ) {
 			$this->file = $file;
@@ -553,6 +553,20 @@ public function _contextual_help( $help, $screen ) {
 		return $help;
 	}
 
+	/**
+	 * Sets the old string-based contextual help for the screen for backward compatibility.
+	 *
+	 * @param WP_Screen $screen
+	 */
+	public function _contextual_help_compat( $screen ) {
+
+		$actual_help = $this->_contextual_help( '', $screen );
+
+		if ( $screen->id == $this->pagehook && $actual_help ) {
+			$screen::add_old_compat_help( $screen, $actual_help );
+		}
+	}
+
 	/**
 	 * Displays page content.
 	 *

Cron.php

@@ -21,7 +21,11 @@ class scbCron {
 	 *
 	 * @return void
 	 */
-	public function __construct( $file = false, $args ) {
+	public function __construct( $file = false, $args = array() ) {
+
+		if ( empty( $args ) ) {
+			return;
+		}
 
 		// Set time & schedule
 		if ( isset( $args['time'] ) ) {

Forms.php

@@ -62,7 +62,7 @@ public static function form_table( $rows, $formdata = null ) {
 	 *
 	 * @return string
 	 */
-	public static function form( $inputs, $formdata = null, $nonce ) {
+	public static function form( $inputs, $formdata = null, $nonce = 'update_options' ) {
 		$output = '';
 		foreach ( $inputs as $input ) {
 			$output .= self::input( $input, $formdata );
@@ -842,7 +842,10 @@ class scbRadiosField extends scbSelectField {
 	 * @return string
 	 */
 	protected function _render_specific( $args ) {
-
+		$args = wp_parse_args( $args, array(
+			'extra' => array(),
+		) );
+		
 		if ( array( 'foo' ) === $args['selected'] ) {
 			// radio buttons should always have one option selected
 			$args['selected'] = key( $args['choices'] );
@@ -857,6 +860,7 @@ protected function _render_specific( $args ) {
 				'type'     => 'radio',
 				'value'    => $value,
 				'checked'  => ( $value == $args['selected'] ),
+				'extra'    => $args['extra'],
 				'desc'     => $title,
 				'desc_pos' => 'after',
 			) );
@@ -895,6 +899,7 @@ protected function _render( $args ) {
 		$args = wp_parse_args( $args, array(
 			'numeric' => false, // use numeric array instead of associative
 			'checked' => null,
+			'extra'   => array(),
 		) );
 
 		if ( ! is_array( $args['checked'] ) ) {
@@ -908,6 +913,7 @@ protected function _render( $args ) {
 				'type'     => 'checkbox',
 				'value'    => $value,
 				'checked'  => in_array( $value, $args['checked'] ),
+				'extra'    => $args['extra'],
 				'desc'     => $title,
 				'desc_pos' => 'after',
 			) );