Merge branch 'master' into fields-ui-modifications

spiritedmedia · Dec 31, 2015 · 0c7dcc5 · 0c7dcc5
2 parents 99b02c9 + 73e422e
commit 0c7dcc5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/php/class-fieldmanager-options.php b/php/class-fieldmanager-options.php
@@ -65,13 +65,20 @@ public function __construct( $label = '', $options = array() ) {
 		fm_add_style( 'fm_options_css', 'css/fieldmanager-options.css' );
 
 		// Sanitization
-		$this->sanitize = function( $value ) {
-			if ( isset( $value ) && is_array( $value ) && !empty( $value ) ) {
-				return array_map( 'sanitize_text_field', $value );
-			} else {
-				return sanitize_text_field( $value );
-			}
-		};
+		$this->sanitize = array( $this, 'sanitize' );
+	}
+
+	/**
+	 * Sanitize function that can handle arrays as well as string values.
+	 * @param array|string $value
+	 * @return array|string Sanitized $value
+	 */
+	public function sanitize( $value ) {
+		if ( isset( $value ) && is_array( $value ) && ! empty( $value ) ) {
+			return array_map( 'sanitize_text_field', $value );
+		} else {
+			return sanitize_text_field( $value );
+		}
 	}
 
 	/**

diff --git a/php/context/class-fieldmanager-context-submenu.php b/php/context/class-fieldmanager-context-submenu.php
@@ -94,7 +94,7 @@ public function render_submenu_page() {
 				<div class="updated success"><p><?php esc_html_e( 'Options updated', 'fieldmanager' ); ?></p></div>
 			<?php endif ?>
 
-			<h2><?php echo esc_html( $this->page_title ) ?></h2>
+			<h1><?php echo esc_html( $this->page_title ) ?></h1>
 
 			<form method="POST" id="<?php echo esc_attr( $this->uniqid ) ?>">
 				<div class="fm-submenu-form-wrapper">

diff --git a/tests/php/test-fieldmanager-context-submenu.php b/tests/php/test-fieldmanager-context-submenu.php
@@ -29,7 +29,7 @@ public function test_submenu_context() {
 		$context = $this->get_context( $name );
 		$html = $this->get_html( $context, $name );
 
-		$this->assertContains( '<h2>Tools Meta Fields</h2>', $html );
+		$this->assertContains( '<h1>Tools Meta Fields</h1>', $html );
 		$this->assertRegExp( '/<input type="hidden"[^>]+name="fieldmanager-' . $name . '-nonce"/', $html );
 		$this->assertRegExp( '/<input[^>]+type="text"[^>]+name="' . $name . '\[name\]"[^>]+value=""/', $html );
 		$this->assertRegExp( '/<input[^>]+type="text"[^>]+name="' . $name . '\[email\]"[^>]+value=""/', $html );