(pl2) Fix unproperly prefixed system settings.

Mark-H · Jul 18, 2012 · 08aaa6f · 08aaa6f
1 parent ec50a57
commit 08aaa6f
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 3 deletions.
diff --git a/_build/build.transport.php b/_build/build.transport.php
@@ -23,7 +23,7 @@ function getSnippetContent($filename = '') {
 define('PKG_NAME','ContextRouter');
 define('PKG_NAME_LOWER',strtolower(PKG_NAME));
 define('PKG_VERSION','1.1.0');
-define('PKG_RELEASE','pl');
+define('PKG_RELEASE','pl2');
 
 $root = dirname(dirname(__FILE__)).'/';
 $sources= array (

diff --git a/_packages/contextrouter-1.1.0-pl.transport.zip b/_packages/contextrouter-1.1.0-pl.transport.zip
diff --git a/_packages/contextrouter-1.1.0-pl2.transport.zip b/_packages/contextrouter-1.1.0-pl2.transport.zip
diff --git a/core/components/contextrouter/docs/changelog.txt b/core/components/contextrouter/docs/changelog.txt
@@ -1,6 +1,7 @@
 ++  ContextRouter 1.1.0-pl
 ++  Released: 2012-07-18
 ++++++++++++++++++++++++++++
+(pl2) Fix unproperly prefixed system settings.
 Big refactoring, now has a class handling the thinking.
 #2 Added includeWww option (ON by default) which optionally also looks out for www.* hosts.
 #3 Added support for http_host_aliases context setting, which allows different http_host values routing to one context.

diff --git a/core/components/contextrouter/model/contextrouter.class.php b/core/components/contextrouter/model/contextrouter.class.php
@@ -12,7 +12,7 @@ class ContextRouter {
      */
     function __construct(modX &$modx,array $config = array()) {
         $this->modx =& $modx;
-        $this->includeWww = $modx->getOption('includeWww', null, true);
+        $this->includeWww = $modx->getOption('contextrouter.includeWww', null, true);
         $this->config = $config;
     }
 
@@ -26,7 +26,7 @@ public function getRoutes () {
     }
 
     public function buildRoutesCache() {
-        $defaultContext = $this->modx->getOption('defaultContext', null, 'web');
+        $defaultContext = $this->modx->getOption('contextrouter.defaultContext', null, 'web');
         if (!empty($defaultContext)) {
             $this->addToRoutesArray('default', $defaultContext, true);
         }