Merge branch 'master' into dev

foliovision · Feb 19, 2016 · 0db6cea · 0db6cea
2 parents 5641e1f + 1ba113c
commit 0db6cea
Showing 1 changed file with 34 additions and 10 deletions.
diff --git a/top-level-cats.php b/top-level-cats.php
@@ -336,13 +336,26 @@ function options_panel() {
       check_admin_referer('fv_top_level_cats');
 
       if( isset($_POST['fv_top_level_cats_submit'] ) ) :
-        $options = get_option( 'fv_top_level_cats', array() );
-
-        $options['category-allow'] = $_POST['post_category'];
-        $options['top-level-only'] = ( $_POST['top-level-only'] ) ? true : false;
-        $options['category-allow-enabled'] = ( $_POST['category-allow-enabled'] ) ? true : false;
-
-        update_option( 'fv_top_level_cats', $options );
+
+        if(isset($_POST['fv_top_level_cats'])) {
+          $options = get_option( 'fv_top_level_cats', array() );
+        }
+
+        if(isset($_POST['post_category'])) {
+          $options['category-allow'] = $_POST['post_category'];
+        }
+
+        if(isset($_POST['top-level-only'])) {
+          $options['top-level-only'] = ( $_POST['top-level-only'] ) ? true : false;
+        }
+
+        if(isset($_POST['category-allow-enabled'])){
+          $options['category-allow-enabled'] = ( $_POST['category-allow-enabled'] ) ? true : false;
+        }
+
+        if(isset($options)) {
+          update_option( 'fv_top_level_cats', $options );
+        }
 ?>
     <div id="message" class="updated fade">
       <p>
@@ -384,18 +397,29 @@ function options_panel() {
               <tr>
                 <td>
                   <label for="top-level-only">
-                    <input type="checkbox" name="top-level-only" id="top-level-only" value="1" <?php if( $options['top-level-only'] ) echo 'checked="checked"'; ?> />
+
+                    <input type="checkbox" name="top-level-only" id="top-level-only" value="1" <?php if( isset($options['top-level-only'] )) { if( $options['top-level-only'] ) echo 'checked="checked"'; }?> />
                     <?php _e('Only use top-level categories in URLs.','fv_tlc') ; ?>
                   </label>
                 </td>
               </tr>                
               <tr>
                 <td>
                   <label for="category-allow-enabled">
-                    <input type="checkbox" name="category-allow-enabled" id="category-allow-enabled" value="1" <?php if( $options['category-allow-enabled'] ) echo 'checked="checked"'; ?> />
+                    <input type="checkbox" name="category-allow-enabled" id="category-allow-enabled" value="1" <?php if(isset($options['category-allow-enabled'])) { if( $options['category-allow-enabled'] ) echo 'checked="checked"'; }?> />
                     <?php _e('Only allow following categories in URLs:','fv_tlc' );?>
                   </label>                  
-                  <blockquote><ul id="category-allow"><?php wp_category_checklist( 0, 0, $options['category-allow'], false, null, false ); ?></ul></blockquote>
+                  <blockquote>
+                    <ul id="category-allow"> <?php  
+                        if( isset($options['category-allow']) ) {
+                            $descendants_and_self = $options['category-allow'];
+                        }else{
+                            $descendants_and_self = 0; //wp default value
+                        }
+                        wp_category_checklist( 0, 0,  $descendants_and_self, false, null, false ); 
+                      ?>
+                    </ul>
+                  </blockquote>
                 </td>
               </tr>                                       
             </table>