mirror of
https://github.com/mosbth/cimage.git
synced 2025-08-12 02:54:09 +02:00
Correcting issue #27 and removing default config-options from img.php
This commit is contained in:
@@ -95,19 +95,26 @@ function verbose($msg = null)
|
||||
|
||||
|
||||
/**
|
||||
* Default configuration options, can be overridden in own config-file.
|
||||
* Get configuration options from file.
|
||||
*/
|
||||
$config = array(
|
||||
|
||||
);
|
||||
|
||||
$configFile = __DIR__.'/'.basename(__FILE__, '.php').'_config.php';
|
||||
$config = array_merge($config, require $configFile);
|
||||
$config = require $configFile;
|
||||
|
||||
call_user_func($config['error_reporting']);
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Set default timezone if not set or if its set in the config-file.
|
||||
*/
|
||||
if (isset($config['default_timezone'])) {
|
||||
date_default_timezone_set($config['default_timezone']);
|
||||
} else if (!ini_get('default_timezone')) {
|
||||
date_default_timezone_set('UTC');
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* verbose, v - do a verbose dump of what happens
|
||||
*/
|
||||
|
@@ -17,6 +17,14 @@ return array(
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Set default timezone, it defaults to UTC if not specified otherwise.
|
||||
*
|
||||
*/
|
||||
//'default_timezone' => 'UTC',
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Max image dimensions,
|
||||
*
|
||||
|
Reference in New Issue
Block a user