diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/config/config.yml | 4 | ||||
-rwxr-xr-x | app/config/global.inc.php | 25 | ||||
-rw-r--r-- | app/config/parameters.yml.dist | 2 |
3 files changed, 3 insertions, 28 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index 7dc1bf51..33db2458 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -5,7 +5,7 @@ imports: | |||
5 | 5 | ||
6 | framework: | 6 | framework: |
7 | #esi: ~ | 7 | #esi: ~ |
8 | #translator: { fallback: "%locale%" } | 8 | translator: { fallback: "%locale%" } |
9 | secret: "%secret%" | 9 | secret: "%secret%" |
10 | router: | 10 | router: |
11 | resource: "%kernel.root_dir%/config/routing.yml" | 11 | resource: "%kernel.root_dir%/config/routing.yml" |
@@ -103,4 +103,4 @@ fos_rest: | |||
103 | routing_loader: | 103 | routing_loader: |
104 | default_format: json | 104 | default_format: json |
105 | 105 | ||
106 | nelmio_api_doc: ~ \ No newline at end of file | 106 | nelmio_api_doc: ~ |
diff --git a/app/config/global.inc.php b/app/config/global.inc.php deleted file mode 100755 index 8e62818b..00000000 --- a/app/config/global.inc.php +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | <?php | ||
2 | /** | ||
3 | * wallabag, self hostable application allowing you to not miss any content anymore | ||
4 | * | ||
5 | * @category wallabag | ||
6 | * @author Nicolas LÅ“uillet <nicolas@loeuillet.org> | ||
7 | * @copyright 2013 | ||
8 | * @license http://opensource.org/licenses/MIT see COPYING file | ||
9 | */ | ||
10 | |||
11 | define('ROOT', dirname(__FILE__) . '/../..'); | ||
12 | |||
13 | require_once ROOT . '/vendor/autoload.php'; | ||
14 | |||
15 | # system configuration | ||
16 | require_once __DIR__ . '/config.inc.php'; | ||
17 | require_once __DIR__ . '/config.inc.default.php'; | ||
18 | |||
19 | if (!ini_get('date.timezone') || !@date_default_timezone_set(ini_get('date.timezone'))) { | ||
20 | date_default_timezone_set('UTC'); | ||
21 | } | ||
22 | |||
23 | if (defined('ERROR_REPORTING')) { | ||
24 | error_reporting(ERROR_REPORTING); | ||
25 | } | ||
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index e1be2e6e..e936911c 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist | |||
@@ -38,4 +38,4 @@ parameters: | |||
38 | export_pdf: true | 38 | export_pdf: true |
39 | 39 | ||
40 | # List view | 40 | # List view |
41 | items_on_page: 12 \ No newline at end of file | 41 | items_on_page: 12 |