[gh-316] Merging test into staging

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

sites/all/modules/unl/includes/unl.admin.inc

@@ -13,6 +13,7 @@ function unl_config($form, &$form_state) {
     '#title' => 'Use base tag',
     '#description' => 'Insert the HTML Base tag in the head of all pages on this site.',
     '#default_value' => variable_get('unl_use_base_tag', TRUE),
+    '#disabled' => !unl_user_is_administrator(),
   );
 
   $form['root']['unl_clean_file_url'] = array(
@@ -20,6 +21,7 @@ function unl_config($form, &$form_state) {
     '#title' => 'Clean file URLs',
     '#description' => 'Enable this once mod_rewrite has been set up to support clean file URLs.',
     '#default_value' => variable_get('unl_clean_file_url'),
+    '#disabled' => !unl_user_is_administrator(),
   );
 
   if (class_exists('Tidy')) {

sites/all/modules/unl/unl.module

@@ -436,7 +436,7 @@ function unl_menu() {
   $items['admin/config/system/unl'] = array(
     'title' => 'UNL',
     'description' => 'Configure UNL System Settings',
-    'access callback' => 'unl_user_is_administrator',
+    'access arguments' => array('administer site configuration'),
     'page callback' => 'drupal_get_form',
     'page arguments' => array('unl_config'),
     'file' => 'includes/unl.admin.inc',