From 229b1373dc46d930ec68047ba0f6c09e0598b8e5 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Tue, 1 Feb 2011 04:43:19 +0000
Subject: [PATCH] - client: make "wrong URL" message not be a notice - web: fix
 caching problem when PHP not installed as Apache module

svn path=/trunk/boinc/; revision=22968
---
 checkin_notes           | 9 +++++++++
 client/cs_scheduler.cpp | 2 +-
 html/inc/cache.inc      | 4 ++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/checkin_notes b/checkin_notes
index b46bd81094..26f5cb48b4 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -411,3 +411,12 @@ Charlie 31 Jan 2011
         GR-ReadMe.rtf
         PTP-ReadMe.rtf
         ReadMe.rtf
+
+David  1 Feb 2011
+    - client: make "wrong URL" message not be a notice
+    - web: fix caching problem when PHP not installed as Apache module
+
+    html/inc/
+        cache.inc
+    client/
+        cs_scheduler.cpp
diff --git a/client/cs_scheduler.cpp b/client/cs_scheduler.cpp
index e1adda3454..ad5651cc8b 100644
--- a/client/cs_scheduler.cpp
+++ b/client/cs_scheduler.cpp
@@ -525,7 +525,7 @@ int CLIENT_STATE::handle_scheduler_reply(PROJECT* project, char* scheduler_url)
                     sr.master_url
                 );
             } else {
-                msg_printf(project, MSG_USER_ALERT,
+                msg_printf(project, MSG_INFO,
                     _("You used the wrong URL for this project.  When convenient, remove this project, then add %s"),
                     sr.master_url
                 );
diff --git a/html/inc/cache.inc b/html/inc/cache.inc
index f861c23013..078b050e4e 100644
--- a/html/inc/cache.inc
+++ b/html/inc/cache.inc
@@ -159,6 +159,10 @@ function cache_need_to_regenerate($path, $max_age){
 
 // Returns cached data or false if nothing was found
 function get_cached_data($max_age, $params=""){
+    global $no_cache;
+
+    if ($no_cache) return;
+
     $path = get_path($params);
     cache_check_diskspace();
     if ($max_age) {