Ryan,
Just noticed something in your trunk on the SVN server. In /manager/includes/document.parser.class.inc.php, around line 167, it looks like you changed it from this:
function getSettings() {
global $base_url, $base_path, $site_url;
if(file_exists($base_path.'/assets/cache/siteCache.idx.php')) {
include_once $base_path.'/assets/cache/siteCache.idx.php';
} else {
$result = $this->dbQuery('SELECT setting_name, setting_value FROM '.$this->getFullTableName('system_settings'));
while ($row = $this->fetchRow($result, 'both')) {
$this->config[$row[0]] = $row[1];
}
}
// store base_url and base_path inside config array
$this->config['base_url'] = $base_url;
$this->config['base_path'] = $base_path;
$this->config['site_url'] = $site_url;
To this:
function getSettings() {
global $base_url, $base_path;
if(file_exists($base_path.'/assets/cache/siteCache.idx.php')) {
include_once $base_path.'/assets/cache/siteCache.idx.php';
} else {
$result = $this->dbQuery('SELECT setting_name, setting_value FROM '.$this->getFullTableName('system_settings'));
while ($row = $this->fetchRow($result, 'both')) {
$this->config[$row[0]] = $row[1];
}
}
// store base_url and base_path inside config array
$this->config['base_url'] = $base_url;
$this->config['base_path'] = $base_path;
Err..is this correct? Looks like the $site_url variable was removed. Don’t we need it for the resource browser, plugins, and what not? Just an observation.
Also, which trunk should we use for testing? The main one or yours? Still a little wet behind the ears with using SVN! Heh heh!
MODX Staff