Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.264
diff -u -p -r1.264 system.install
--- modules/system/system.install 15 Sep 2008 09:28:50 -0000 1.264
+++ modules/system/system.install 17 Sep 2008 07:01:42 -0000
@@ -10,6 +10,7 @@
* An array of system requirements.
*/
function system_requirements($phase) {
+ global $base_url;
$requirements = array();
// Ensure translations don't break at install time
$t = get_t();
@@ -171,7 +172,7 @@ function system_requirements($phase) {
}
$description .= ' ' . $t('You can run cron manually.', array('@cron' => url('admin/reports/status/run-cron')));
- $description .= '
' . $t('To run cron from outside the site, go to !cron', array('!cron' => url('cron.php', array('absolute' => true, 'query' => 'cron_key=' . variable_get('cron_key', 'drupal')))));
+ $description .= '
' . $t('To run cron from outside the site, go to !cron', array('!cron' => url($base_url . '/cron.php', array('external' => TRUE, 'query' => 'cron_key=' . variable_get('cron_key', 'drupal')))));
$requirements['cron'] = array(
'title' => $t('Cron maintenance tasks'),
Index: modules/system/system.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.test,v
retrieving revision 1.12
diff -u -p -r1.12 system.test
--- modules/system/system.test 15 Sep 2008 20:48:09 -0000 1.12
+++ modules/system/system.test 17 Sep 2008 07:01:42 -0000
@@ -212,18 +212,19 @@ class CronRunTestCase extends DrupalWebT
* Test cron runs.
*/
function testCronRun() {
+ global $base_url;
// Run cron anonymously without any cron key.
- $this->drupalGet('cron.php');
+ $this->drupalGet($base_url . '/cron.php', array('external' => TRUE));
$this->assertResponse(403);
// Run cron anonymously with a random cron key.
$key = $this->randomName(16);
- $this->drupalGet('cron.php', array('query' => 'cron_key=' . $key));
+ $this->drupalGet($base_url . '/cron.php', array('external' => TRUE, 'query' => 'cron_key=' . $key));
$this->assertResponse(403);
// Run cron anonymously with the valid cron key.
$key = variable_get('cron_key', 'drupal');
- $this->drupalGet('cron.php', array('query' => 'cron_key=' . $key));
+ $this->drupalGet($base_url . '/cron.php', array('external' => TRUE, 'query' => 'cron_key=' . $key));
$this->assertResponse(200);
// Execute cron directly.