Merge branch 'master' into development

2014-10-27 19:23:16 -04:00
parent 861e94089b 4f30e0466a
commit a9f0361224
2 changed files with 5 additions and 4 deletions
--- a/inc/options.inc.php
+++ b/inc/options.inc.php
@ -11,7 +11,8 @@ foreach ( $cat_list as $cw_cat ){
 $cwv3_op_data = array(
 	'plugin_title'	=>	'Content Warning v3',
 	'prefix'		=>	'cwv3_',
-	'menu_title'	=>	'CWv3 Options',
+	'menu_title'	=>	'Content Warning v3',
+	'menu_type'		=>	'option',
 	'slug'			=>	'cwv3_options',
 	'opData'	=>	array(
 		'sitewide'	=>	array(
--- a/lib/jw_simple_options
+++ b/lib/jw_simple_options