diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-02-21 15:57:10 +0100 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-02-21 15:57:10 +0100 |
| commit | 99679d06884120c57f43b44e55e03595f1f87bed (patch) | |
| tree | a3f2a1aa1afdaeca1386d0c6e8a75344fd2241fb /inc/3rdparty/config.php | |
| parent | 655214ab30ee84884dc408488b85586f36263fcb (diff) | |
| parent | d3b47e94705e17b3ba3529cbb1dc6efe69c5d2b7 (diff) | |
| download | wallabag-1.5.2.tar.gz wallabag-1.5.2.tar.zst wallabag-1.5.2.zip | |
Merge pull request #481 from wallabag/dev1.5.2
1.5.2
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 | ||