diff options
author | Sem <sembrestels@riseup.net> | 2012-07-20 07:09:38 +0200 |
---|---|---|
committer | Sem <sembrestels@riseup.net> | 2012-07-20 07:09:38 +0200 |
commit | 07b599a683760d2542014bb04a681463420a3565 (patch) | |
tree | cfcd06671529eeec7790fb70a8d490094d7942c9 /engine/classes/ElggPluginManifest.php | |
parent | ea0140d87534c3b10e489d13a1449ebb79da832d (diff) | |
parent | 174763bcbcd20812dc09f27b64908f9d71b523b9 (diff) | |
download | elgg-07b599a683760d2542014bb04a681463420a3565.tar.gz elgg-07b599a683760d2542014bb04a681463420a3565.tar.bz2 |
Merge branch 'lorea-preprod'
Conflicts:
.gitmodules
Diffstat (limited to 'engine/classes/ElggPluginManifest.php')
-rw-r--r-- | engine/classes/ElggPluginManifest.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engine/classes/ElggPluginManifest.php b/engine/classes/ElggPluginManifest.php index 7e79c15c8..6b3932b32 100644 --- a/engine/classes/ElggPluginManifest.php +++ b/engine/classes/ElggPluginManifest.php @@ -456,7 +456,7 @@ class ElggPluginManifest { * Normalizes a dependency array using the defined structs. * Can be used with either requires or suggests. * - * @param array $dep An dependency array. + * @param array $dep A dependency array. * @return array The normalized deps array. */ private function normalizeDep($dep) { @@ -500,8 +500,10 @@ class ElggPluginManifest { break; } } - break; + default: + // unrecognized so we just return the raw dependency + return $dep; } $normalized_dep = $this->buildStruct($struct, $dep); |