diff options
| author | Nicolas Lœuillet <nicolas.loeuillet@gmail.com> | 2014-02-20 13:03:59 +0100 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas.loeuillet@gmail.com> | 2014-02-20 13:03:59 +0100 |
| commit | 8975653d4c1e31981b3af190aa5b59754190c757 (patch) | |
| tree | 9c2c77ade29fb692799e7c2508ae6d0fa3fa7257 /inc/3rdparty/config.php | |
| parent | 689de3dbcc1252e230ab25723c237723f5a4d4a1 (diff) | |
| parent | ab5bb94b12e04b357f8faee376704bc29ff019a5 (diff) | |
| download | wallabag-8975653d4c1e31981b3af190aa5b59754190c757.tar.gz wallabag-8975653d4c1e31981b3af190aa5b59754190c757.tar.zst wallabag-8975653d4c1e31981b3af190aa5b59754190c757.zip | |
Merge branch 'mariroz-dev' into dev
Diffstat (limited to 'inc/3rdparty/config.php')
| -rwxr-xr-x[-rw-r--r--] | inc/3rdparty/config.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/inc/3rdparty/config.php b/inc/3rdparty/config.php index 61fc0d0e..e618117b 100644..100755 --- a/inc/3rdparty/config.php +++ b/inc/3rdparty/config.php | |||
| @@ -11,6 +11,8 @@ | |||
| 11 | // options you'd like to override in custom_config.php. | 11 | // options you'd like to override in custom_config.php. |
| 12 | // ..................................................... | 12 | // ..................................................... |
| 13 | 13 | ||
| 14 | global $options; | ||
| 15 | |||
| 14 | // Create config object | 16 | // Create config object |
| 15 | if (!isset($options)) $options = new stdClass(); | 17 | if (!isset($options)) $options = new stdClass(); |
| 16 | 18 | ||