Fix issues with filemanager_path/url in non-web contexts

modxcms · May 11, 2011 · 339e489 · 339e489
1 parent 30d5538
commit 339e489
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/core/model/modx/modfilehandler.class.php b/core/model/modx/modfilehandler.class.php
@@ -55,8 +55,6 @@ public function make($path, array $options = array(), $overrideClass = '') {
     /**
      * Get the modX base path for the user.
      *
-     * @param string $prependBasePath If true, will prepend the modX base path
-     * to the return value. Defaults to true.
      * @return string The base path
      */
     public function getBasePath() {
@@ -76,6 +74,8 @@ public function getBasePath() {
 
     /**
      * Get base URL of file manager
+     *
+     * @return string The base URL
      */
     public function getBaseUrl() {
         $baseUrl = $this->context->getOption('filemanager_url', $this->context->getOption('rb_base_url', MODX_BASE_URL, $this->config), $this->config);

diff --git a/core/model/modx/processors/element/tv/renders/mgr/input/image.php b/core/model/modx/processors/element/tv/renders/mgr/input/image.php
@@ -15,8 +15,10 @@
         return $modx->error->failure($modx->lexicon('permission_denied'));
     }
     $params['wctx'] = $workingContext->get('key');
+    $modx->fileHandler->context =& $workingContext;
 } else {
     $params['wctx'] = $modx->context->get('key');
+    $workingContext =& $modx->context;
 }
 
 $value = $this->get('value');
@@ -37,15 +39,15 @@
 if (empty($params['basePath'])) {
     $params['basePath'] = $modx->fileHandler->getBasePath();
     $params['basePath'] = str_replace($replaceKeys,$replaceValues,$params['basePath']);
-    $params['basePathRelative'] = $this->xpdo->getOption('filemanager_path_relative',null,true) ? 1 : 0;
+    $params['basePathRelative'] = $workingContext->getOption('filemanager_path_relative',true) ? 1 : 0;
 } else {
     $params['basePath'] = str_replace($replaceKeys,$replaceValues,$params['basePath']);
     $params['basePathRelative'] = !isset($params['basePathRelative']) || in_array($params['basePathRelative'],array('true',1,'1'));
 }
 if (empty($params['baseUrl'])) {
     $params['baseUrl'] = $modx->fileHandler->getBaseUrl();
     $params['baseUrl'] = str_replace($replaceKeys,$replaceValues,$params['baseUrl']);
-    $params['baseUrlRelative'] = $this->xpdo->getOption('filemanager_url_relative',null,true) ? 1 : 0;
+    $params['baseUrlRelative'] = $workingContext->getOption('filemanager_url_relative',true) ? 1 : 0;
 } else {
     $params['baseUrl'] = str_replace($replaceKeys,$replaceValues,$params['baseUrl']);
     $params['baseUrlRelative'] = !isset($params['baseUrlRelative']) || in_array($params['baseUrlRelative'],array('true',1,'1'));
@@ -64,7 +66,6 @@
 } else {
     $relativeValue = $value;
 }
-
 if (!empty($value) && strpos($value,'/') !== false) {
     $dir = pathinfo($value,PATHINFO_DIRNAME);
     $dir = rtrim($dir,'/').'/';

diff --git a/manager/controllers/default/resource/tvs.php b/manager/controllers/default/resource/tvs.php
@@ -10,6 +10,9 @@
 $resourceClass = $resource->get('class_key');
 $resourceDir= strtolower(substr($resourceClass, 3));
 $resourceId = !empty($resource) ? $resource->get('id') : 0;
+if ($resource && $resource instanceof modResource) {
+    $_GET['wctx'] = $resource->get('context_key');
+}
 
 $onResourceTVFormPrerender = $modx->invokeEvent('OnResourceTVFormPrerender',array(
     'resource' => $resourceId,