diff options
| author | Steve Clay <steve@mrclay.org> | 2012-11-26 17:33:37 -0500 | 
|---|---|---|
| committer | Steve Clay <steve@mrclay.org> | 2012-11-26 17:33:37 -0500 | 
| commit | 522a8d1a7b6eaf5e6bd826f6d29d51eb5f788b64 (patch) | |
| tree | cf33a300c33fb8bd2b533aa5800bf6bf6ec39a0b /engine/classes | |
| parent | de8c85e5d53cfcc7b9ae52ce2f481cff499ae915 (diff) | |
| parent | 937119200300ebc2b09df4354fb7cd547535ecfb (diff) | |
| download | elgg-522a8d1a7b6eaf5e6bd826f6d29d51eb5f788b64.tar.gz elgg-522a8d1a7b6eaf5e6bd826f6d29d51eb5f788b64.tar.bz2  | |
Merge branch 'pr-444' into 1.8
Diffstat (limited to 'engine/classes')
| -rw-r--r-- | engine/classes/ElggPlugin.php | 7 | 
1 files changed, 5 insertions, 2 deletions
diff --git a/engine/classes/ElggPlugin.php b/engine/classes/ElggPlugin.php index 3e43c8e81..c6ce2905f 100644 --- a/engine/classes/ElggPlugin.php +++ b/engine/classes/ElggPlugin.php @@ -36,8 +36,9 @@ class ElggPlugin extends ElggObject {  	 * @warning Unlike other ElggEntity objects, you cannot null instantiate  	 *          ElggPlugin. You must point it to an actual plugin GUID or location.  	 * -	 * @param mixed $plugin The GUID of the ElggPlugin object or the path of -	 *                      the plugin to load. +	 * @param mixed $plugin The GUID of the ElggPlugin object or the path of the plugin to load. +	 * +	 * @throws PluginException  	 */  	public function __construct($plugin) {  		if (!$plugin) { @@ -76,6 +77,8 @@ class ElggPlugin extends ElggObject {  			// load the rest of the plugin  			parent::__construct($existing_guid);  		} + +		_elgg_cache_plugin_by_id($this);  	}  	/**  | 
