Merge branch 'master' of https://github.com/pfefferle/wordpress-semantic-linkbacks

Author: pfefferle

semantic-linkbacks.php

@@ -12,7 +12,7 @@
  * Requires PHP: 5.4
  */
 
-add_action( 'plugins_loaded', array( 'Semantic_Linkbacks_Plugin', 'init' ) );
+add_action( 'plugins_loaded', array( 'Semantic_Linkbacks_Plugin', 'init' ), 11 );
 
 // initialize admin settings
 add_action( 'admin_init', array( 'Semantic_Linkbacks_Plugin', 'admin_init' ) );
@@ -61,7 +61,7 @@ public static function init() {
 
 	public static function admin_init() {
 		self::privacy_declaration();
-		$page = class_exists( 'Webmention_Plugin' ) ? 'webmention' : 'discussion';
+		$page = function_exists( 'webmention_init' ) ? 'webmention' : 'discussion';
 		add_settings_section(
 			'semantic-linkbacks',
 			__( 'Semantic Linkbacks Settings', 'semantic-linkbacks' ),
@@ -93,13 +93,13 @@ public static function facepile_checkboxes() {
 		$facepile = get_option( 'semantic_linkbacks_facepiles' );
 		echo '<div id="facepile-all">';
 		foreach ( $strings as $key => $value ) {
-			printf( '<input name="semantic_linkbacks_facepiles[]" type="checkbox" value="%1$s" %2$s />%3$s<br />', $key, checked( in_array( $key, $facepile, true ), true, false ), $value );
+			printf( '<input name="semantic_linkbacks_facepiles[]" type="checkbox" value="%1$s" id="%1$s" %2$s /><label for="%1$s">%3$s</label><br />', $key, checked( in_array( $key, $facepile, true ), true, false ), $value );
 		}
 		echo '</div>';
 	}
 
 	public static function register_settings() {
-		$option_group = class_exists( 'Webmention_Plugin' ) ? 'webmention' : 'discussion';
+		$option_group = function_exists( 'webmention_init' ) ? 'webmention' : 'discussion';
 		register_setting(
 			$option_group,
 			'semantic_linkbacks_facepiles',