Commit 32b6b1e6 authored by mikeytown2's avatar mikeytown2

#937904: fix q notice in boost_init

parent b3244c6c
......@@ -902,7 +902,7 @@ function boost_admin_boost_performance_page() {
}
elseif (!isset($best)) {
$best = $document_root;
$description_extra = t('Please open an boost issue on Drupal.org, since apache and php are not configured correctly.');
$description_extra = t('Please <a href="!link">open an boost issue on Drupal.org</a>, since apache and php might not be configured correctly.', array('!link' => url('http://drupal.org/node/add/project-issue/boost')));
}
$description = t('Value of %best is recommended for this server.', array('%best' => $best)) . ' ' . $description_extra;
$form['htaccess']['boost_document_root'] = array(
......
......@@ -466,7 +466,7 @@ function boost_init() {
$path = implode($base_path, $path);
$path = explode('?', $path);
$path = array_shift($path);
if ($path != '' && $_REQUEST['q'] == '' && !stristr($path, '.php') && isset($_SERVER['REDIRECT_STATUS']) && $_SERVER['REDIRECT_STATUS'] == 404) {
if ($path != '' && empty($_REQUEST['q']) && !stristr($path, '.php') && isset($_SERVER['REDIRECT_STATUS']) && $_SERVER['REDIRECT_STATUS'] == 404) {
$GLOBALS['conf']['cache'] = CACHE_DISABLED;
$GLOBALS['_boost_cache_this'] = FALSE;
......@@ -479,13 +479,13 @@ function boost_init() {
}
//set variables
if (isset($_REQUEST['q'])) {
$GLOBALS['_boost_path'] = $_REQUEST['q'];
}
else {
if (empty($_REQUEST['q'])) {
//front page
$GLOBALS['_boost_path'] = '';
}
else {
$GLOBALS['_boost_path'] = $_REQUEST['q'];
}
// Make the proper filename for our query
$GLOBALS['_boost_query'] = BOOST_CHAR;
$query = array();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment