mirror/minify
1
0
Fork 0
mirror of https://github.com/mrclay/minify.git synced 2025-08-12 00:54:35 +02:00
Code Issues Releases Wiki Activity

Minor stuff, testing NetBeans editor

Browse Source
This commit is contained in:
Steve Clay
2009-07-16 16:24:23 +00:00
parent 9df8656e9e
commit c63f0bf567
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
min/index.php
View File

@@ -15,7 +15,7 @@ require MINIFY_MIN_DIR . '/config.php';
// setup include path // setup include path
set_include_path($min_libPath . PATH_SEPARATOR . get_include_path()); set_include_path($min_libPath . PATH_SEPARATOR . get_include_path());
require 'Minify.php'; require $min_libPath . '/Minify.php';
Minify::$uploaderHoursBehind = $min_uploaderHoursBehind; Minify::$uploaderHoursBehind = $min_uploaderHoursBehind;
Minify::setCache( Minify::setCache(
@@ -37,9 +37,9 @@ if ($min_allowDebugFlag && isset($_GET['debug'])) {
} }
if ($min_errorLogger) { if ($min_errorLogger) {
require_once 'Minify/Logger.php'; require_once $min_libPath . '/Minify/Logger.php';
if (true === $min_errorLogger) { if (true === $min_errorLogger) {
require_once 'FirePHP.php'; require_once $min_libPath . '/FirePHP.php';
Minify_Logger::setLogger(FirePHP::getInstance(true)); Minify_Logger::setLogger(FirePHP::getInstance(true));
} else { } else {
Minify_Logger::setLogger($min_errorLogger); Minify_Logger::setLogger($min_errorLogger);
@@ -51,7 +51,7 @@ if (preg_match('/&\\d/', $_SERVER['QUERY_STRING'])) {
$min_serveOptions['maxAge'] = 31536000; $min_serveOptions['maxAge'] = 31536000;
} }
if (isset($_GET['g'])) { if (isset($_GET['g'])) {
// well need groups config // we'll need groups config
$min_serveOptions['minApp']['groups'] = (require MINIFY_MIN_DIR . '/groupsConfig.php'); $min_serveOptions['minApp']['groups'] = (require MINIFY_MIN_DIR . '/groupsConfig.php');
} }
if (isset($_GET['f']) || isset($_GET['g'])) { if (isset($_GET['f']) || isset($_GET['g'])) {

2
min/lib/Minify/Controller/Page.php
View File

@@ -33,13 +33,13 @@ class Minify_Controller_Page extends Minify_Controller_Base {
* 'minifyAll': should all CSS and Javascript blocks be individually * 'minifyAll': should all CSS and Javascript blocks be individually
* minified? (default false) * minified? (default false)
* *
* @todo Add 'file' option to read HTML file.
*/ */
public function setupSources($options) { public function setupSources($options) {
if (isset($options['file'])) { if (isset($options['file'])) {
$sourceSpec = array( $sourceSpec = array(
'filepath' => $options['file'] 'filepath' => $options['file']
); );
unset($options['file']);
} else { } else {
// strip controller options // strip controller options
$sourceSpec = array( $sourceSpec = array(