diff options
author | Brion Vibber <brion@pobox.com> | 2010-04-06 14:36:21 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-04-06 14:36:21 -0700 |
commit | 3da8989242cc010c9c314bb3d67058dd047fe255 (patch) | |
tree | 630ea418fa0c15318cbf9539dc14e0a6dc0c49f2 /plugins/Meteor/MeteorPlugin.php | |
parent | 295b2d02bb841f5534dbd56bbab602b2033d8172 (diff) | |
parent | 7c3b320a7a28cdc6fcab9b5c4854bba0775d6ec2 (diff) |
Merge branch 'master' into testing
Diffstat (limited to 'plugins/Meteor/MeteorPlugin.php')
-rw-r--r-- | plugins/Meteor/MeteorPlugin.php | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/plugins/Meteor/MeteorPlugin.php b/plugins/Meteor/MeteorPlugin.php index 5b345d7c2..5600d5fcc 100644 --- a/plugins/Meteor/MeteorPlugin.php +++ b/plugins/Meteor/MeteorPlugin.php @@ -65,6 +65,26 @@ class MeteorPlugin extends RealtimePlugin parent::__construct(); } + /** + * Pull settings from config file/database if set. + */ + function initialize() + { + $settings = array('webserver', + 'webport', + 'controlport', + 'controlserver', + 'channelbase'); + foreach ($settings as $name) { + $val = common_config('meteor', $name); + if ($val !== false) { + $this->$name = $val; + } + } + + return parent::initialize(); + } + function _getScripts() { $scripts = parent::_getScripts(); |