Merge pull request #8830 from ewinslow/zaudio-followup

chore(zaudio): Followup to remove remaining references
Elgg · Aug 8, 2015 · c44c5c4 · c44c5c4
2 parents 8063397 + 69e9f78
commit c44c5c4
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 8 deletions.
diff --git a/docs/admin/upgrading.rst b/docs/admin/upgrading.rst
@@ -43,10 +43,10 @@ From 1.x to 2.0
 Removed plugins
 ---------------
 
-The following plugins will no longer be bundled with Elgg core:
+The following plugins are no longer bundled with Elgg core:
 
  * categories (https://github.com/elgg/categories)
-
+ * zaudio (https://github.com/elgg/zaudio)
 
 IE-specific workarounds have been dropped
 -----------------------------------------

diff --git a/docs/plugins/index.rst b/docs/plugins/index.rst
@@ -41,5 +41,4 @@ The following plugins are also bundled with Elgg, but are not (yet) documented
 - tagcloud
 - twitter_api
 - uservalidationbyemail
-- web_services
-- zaudio
+- web_services
diff --git a/engine/classes/Elgg/Composer/PostUpdate.php b/engine/classes/Elgg/Composer/PostUpdate.php
@@ -57,7 +57,6 @@ public static function execute(Event $event) {
 			'twitter_api',
 			'uservalidationbyemail',
 			'web_services',
-			'zaudio',
 		];
 
 		foreach ($managed_plugins as $plugin) {

diff --git a/engine/classes/Elgg/Project/CodeStyle.php b/engine/classes/Elgg/Project/CodeStyle.php
@@ -156,7 +156,7 @@ protected function findFiles($dir, &$files) {
 			$relative_path = substr($full, $this->substr_start);
 
 			if (is_dir($full)) {
-				if ($entry[0] === '.' || preg_match('~(?:/vendors?|/zaudio/audioplayer)$~', $full)) {
+				if ($entry[0] === '.' || preg_match('~(?:/vendors?)$~', $full)) {
 					// special case
 					if ($entry !== '.scripts') {
 						continue;

diff --git a/engine/classes/ElggPluginManifest.php b/engine/classes/ElggPluginManifest.php
@@ -385,7 +385,6 @@ public function getCategories() {
 			'aalborg_theme',
 			'blog',
 			'bookmarks',
-			'categories',
 			'ckeditor',
 			'custom_index',
 			'dashboard',
@@ -418,7 +417,6 @@ public function getCategories() {
 			'twitter_api',
 			'uservalidationbyemail',
 			'web_services',
-			'zaudio',
 		);
 
 		$cats = $this->parser->getAttribute('category');