Merge git://github.com/Izikd/minify-cakephp

prgTW · Aug 21, 2012 · 0524ffd · 0524ffd
2 parents 247ff04 + cada0ee
commit 0524ffd
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Controller/MinifyController.php b/Controller/MinifyController.php
@@ -35,14 +35,14 @@ public function index($type) {
 				$plugin = $first;
 			}
 
-			$pluginPath = (!empty($plugin) ? '..' . DS . 'Plugin' . DS . $plugin . DS . WEBROOT_DIR . DS : '');
-			$file = $pluginPath . $type . DS . $file . '.' . $type;
+			$pluginPath = (!empty($plugin) ? '../Plugin/' . $plugin . '/' . WEBROOT_DIR . '/' : '');
+			$file = $pluginPath . $type . '/' . $file . '.' . $type;
 			$newFiles[] = $file;
 
 			if (!empty($plugin) && !isset($plugins[$plugin])) {
 				$plugins[$plugin] = true;
 
-				$pluginSymlinks['/' . $this->request->base . '/' . Inflector::underscore($plugin)] = APP . 'Plugin' . DS . $plugin . DS . WEBROOT_DIR;
+				$pluginSymlinks['/' . $this->request->base . '/' . Inflector::underscore($plugin)] = APP . 'Plugin/' . $plugin . '/' . WEBROOT_DIR;
 			}
 		}
 		$_GET['f'] = implode(',', $newFiles);
@@ -51,7 +51,7 @@ public function index($type) {
 		App::import('Vendor', 'Minify.minify/index');
 
 		$this->response->statusCode('304');
-		exit();
+		exit;
 	}
 
 }