[gh-280] Merging from testing into staging -c 1397

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

includes/unl_bootstrap.inc

@@ -15,6 +15,11 @@ function unl_bootstrap() {
  * If it doesn't redirect to <hostname>.unl.edu.
  */
 function unl_bootstrap_short_hostname_redirect() {
+  // Don't do a redirect when using the command line.
+  if (PHP_SAPI == 'cli') {
+    return;
+  }
+  
   $hostname = $_SERVER['HTTP_HOST'];
   if (gethostbynamel($hostname)) {
     // The provided host name is just fine.