Fix mistakes.

petertron · Mar 4, 2017 · 98a8754 · 98a8754
1 parent 701ea90
commit 98a8754
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/content/content.precompile_assets_ajax.php b/content/content.precompile_assets_ajax.php
@@ -62,7 +62,7 @@ public function build(array $context = array())
         $precompile = explode(',', $settings['precompile_files']);
         foreach ($precompile as $input_file) {
             $input_file = trim(trim($input_file), '/');
-            $output_file = file_get_contents('ap.filename-for://' . $input_file);
+            $output_file = file_get_contents('ap.filename://' . $input_file);
             if (General::getExtension($input_file) == 'php') {
                 $input_file = substr($input_file, 0, -4);
             }

diff --git a/lib/defines.php b/lib/defines.php
@@ -30,5 +30,6 @@ function define_here($name, $value)
     $output_dir = trim($settings['output_directory'], '/');
     $use_docroot = ($settings['output_parent_directory'] == 'docroot');
     define_here('OUTPUT_DIR', ($use_docroot ? \DOCROOT : \WORKSPACE) . '/' . $output_dir);
+    //define_here('OUTPUT_URL', \URL . ($use_docroot ? '/' : '/workspace/') . $output_dir);
     define_here('OUTPUT_URL', ($use_docroot ? '/' : '/workspace/') . $output_dir);
 }
diff --git a/lib/functions.php b/lib/functions.php
@@ -110,7 +110,7 @@ function url($file)
     if (is_file(OUTPUT_DIR . '/' . $file_out)) {
         return OUTPUT_URL . '/' . $file_out;
     } else {
-        return file_get_contents('ap.url-for://' . $file);
+        return file_get_contents('ap.url://' . $file);
     }
 }
 
@@ -123,7 +123,7 @@ function css_url($file)
         return OUTPUT_URL . '/' . $file_out;
     } else {
         #return file_get_contents('am.data://css-url/' . $file);
-        return file_get_contents('ap.url-for://' . $file . '?output_type=css');
+        return file_get_contents('ap.url://' . $file . '?output_type=css');
     }
 }
 
@@ -134,7 +134,7 @@ function js_url($file)
     if (is_file(OUTPUT_DIR . '/' . $file_out)) {
         return OUTPUT_URL . '/' . $file_out;
     } else {
-        return file_get_contents('ap.url-for://' . $file . '?output_type=js');
+        return file_get_contents('ap.url://' . $file . '?output_type=js');
     }
 }
 

diff --git a/lib/stream/class.APStream.php b/lib/stream/class.APStream.php
@@ -96,7 +96,7 @@ function setOutput()
                 }
             }
 
-            if ($this->action == 'url-for') {
+            if ($this->action == 'url') {
                 // Save file and output file URL.
                 $output_file = filename_insert_md5($modified_file_path, md5($content));
                 if (APP_MODE == 'administration') {
@@ -106,7 +106,7 @@ function setOutput()
                     file_put_contents(ASSET_CACHE . '/' . $output_file, $content);
                     $this->output = '/' . $output_file . '/?mode=pipeline';
                 }
-            } elseif ($this->action == 'filename-for') {
+            } elseif ($this->action == 'filename') {
                 $output_file = filename_insert_md5($modified_file_path, md5($content));
                 file_put_contents(OUTPUT_DIR . '/' . $output_file, $content);
                 $this->output = $output_file;
@@ -115,7 +115,7 @@ function setOutput()
             }
         } else {
             // Non-text file.
-            if ($this->action == 'url-for') {
+            if ($this->action == 'url') {
                 $output_file = filename_insert_md5($modified_file_path, md5_file($source_file_abs));
                 if (APP_MODE == 'administration') {
                     copy($source_file_abs, OUTPUT_DIR . '/' . $output_file);

diff --git a/lib/stream/stream-setup.php b/lib/stream/stream-setup.php
@@ -4,5 +4,5 @@
 require 'class.APStream.php';
 
 stream_wrapper_register('ap', 'AssetPipeline\APStream');
-stream_wrapper_register('ap.url-for', 'AssetPipeline\APStream');
-stream_wrapper_register('ap.filename-for', 'AssetPipeline\APStream');
+stream_wrapper_register('ap.url', 'AssetPipeline\APStream');
+stream_wrapper_register('ap.filename', 'AssetPipeline\APStream');