diff options
| author | Nicolas Lœuillet <nicolas.loeuillet@gmail.com> | 2014-02-20 12:49:49 +0100 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas.loeuillet@gmail.com> | 2014-02-20 12:49:49 +0100 |
| commit | ab5bb94b12e04b357f8faee376704bc29ff019a5 (patch) | |
| tree | e055f9cf96738f7b8a26caed4893951022527eed /inc/3rdparty/config.php | |
| parent | d09a5674e915e79762931a3465461327fb5737ea (diff) | |
| parent | e83cf5a7875d1387d79d1909050ff2eca9b4421a (diff) | |
| download | wallabag-ab5bb94b12e04b357f8faee376704bc29ff019a5.tar.gz wallabag-ab5bb94b12e04b357f8faee376704bc29ff019a5.tar.zst wallabag-ab5bb94b12e04b357f8faee376704bc29ff019a5.zip | |
Merge branch 'dev' of git://github.com/mariroz/wallabag into mariroz-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 | ||