Merging trunk into testing

git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/testing@313 20a16fea-79d4-4915-8869-1ea9d5ebf173

sites/all/modules/unl/unl.module

@@ -248,6 +248,14 @@ function unl_form_alter(&$form, $form_state, $form_id) {
     // Also turn on revisioning by default
     $form['revision_information']['revision']['#default_value'] = TRUE;
     unset($form['revision_information']['revision']['#states']);
+    
+    // Also hide the "Promoted to front page" option
+    $form['options']['promote']['#prefix'] = '<div style="display:none;">';
+    $form['options']['promote']['#suffix'] = '</div>';
+    
+    // Also hide the "Sticky at top of lists" option
+    $form['options']['sticky']['#prefix'] = '<div style="display:none;">';
+    $form['options']['sticky']['#suffix'] = '</div>';
   }
 }