All line endings are now Unix-style.

git-svn-id: https://code.elgg.org/elgg/trunk@3451 36083f99-b078-4883-b0ff-0f9b5a30f544

4 files changed, 54 insertions, 54 deletions

diff --git a/actions/admin/plugins/disable.php b/actions/admin/plugins/disable.php
index 2241730ad..90825bc2f 100644
--- a/actions/admin/plugins/disable.php
+++ b/actions/admin/plugins/disable.php
@@ -29,9 +29,9 @@
 		else
 			register_error(sprintf(elgg_echo('admin:plugins:disable:no'), $p));
 	}		
-	

+	
 	elgg_view_regenerate_simplecache();
-	elgg_filepath_cache_reset();

+	elgg_filepath_cache_reset();
 		
 	forward($_SERVER['HTTP_REFERER']);
 	exit;
diff --git a/actions/admin/plugins/disableall.php b/actions/admin/plugins/disableall.php
index 5d0be4ad6..672915bce 100644
--- a/actions/admin/plugins/disableall.php
+++ b/actions/admin/plugins/disableall.php
@@ -26,9 +26,9 @@
 		else
 			register_error(sprintf(elgg_echo('admin:plugins:disable:no'), $p));
 	}		
-	

+	
 	elgg_view_regenerate_simplecache();
-	elgg_filepath_cache_reset();

+	elgg_filepath_cache_reset();
 		
 	forward($_SERVER['HTTP_REFERER']);
 	exit;
diff --git a/actions/admin/plugins/enable.php b/actions/admin/plugins/enable.php
index 26d7abaf4..890e6648e 100644
--- a/actions/admin/plugins/enable.php
+++ b/actions/admin/plugins/enable.php
@@ -29,7 +29,7 @@
 		else
 			register_error(sprintf(elgg_echo('admin:plugins:enable:no'), $p));		
 	}
-		

+		
 	elgg_view_regenerate_simplecache();
 	elgg_filepath_cache_reset();
 	
diff --git a/actions/admin/plugins/reorder.php b/actions/admin/plugins/reorder.php
index 50409df95..36ba1f66d 100644
--- a/actions/admin/plugins/reorder.php
+++ b/actions/admin/plugins/reorder.php
@@ -1,54 +1,54 @@
-<?php

-	/**

+<?php
+	/**
 	 * Reorder plugin action.
-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @author Curverider Ltd

+	 * @author Curverider Ltd
 
-	 * @link http://elgg.org/

-	 */

-

-	require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");

-	

-	// block non-admin users

-	admin_gatekeeper();

-	

-	// Validate the action

-	action_gatekeeper();

-	

-	// Get the plugin 

-	$mod = get_input('plugin');

-	$mod = str_replace('.','',$mod);

-	$mod = str_replace('/','',$mod);

-	

-	// Get the new order

-	$order = (int) get_input('order');

-	

-	// Get the current plugin list

-	$plugins = get_plugin_list();

-

-	// Inject the plugin order back into the list

-	if ($key = array_search($mod, $plugins)) {

-		

-		unset($plugins[$key]);

-		while (isset($plugins[$order])) {

-			$order++;

-		}

-		

-		$plugins[$order] = $mod;

-	}

-	

-	// Disable

-	if (regenerate_plugin_list($plugins))

-		system_message(sprintf(elgg_echo('admin:plugins:reorder:yes'), $plugin));

-	else

-		register_error(sprintf(elgg_echo('admin:plugins:reorder:no'), $plugin));		

-		

+	 * @link http://elgg.org/
+	 */
+
+	require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
+	
+	// block non-admin users
+	admin_gatekeeper();
+	
+	// Validate the action
+	action_gatekeeper();
+	
+	// Get the plugin 
+	$mod = get_input('plugin');
+	$mod = str_replace('.','',$mod);
+	$mod = str_replace('/','',$mod);
+	
+	// Get the new order
+	$order = (int) get_input('order');
+	
+	// Get the current plugin list
+	$plugins = get_plugin_list();
+
+	// Inject the plugin order back into the list
+	if ($key = array_search($mod, $plugins)) {
+		
+		unset($plugins[$key]);
+		while (isset($plugins[$order])) {
+			$order++;
+		}
+		
+		$plugins[$order] = $mod;
+	}
+	
+	// Disable
+	if (regenerate_plugin_list($plugins))
+		system_message(sprintf(elgg_echo('admin:plugins:reorder:yes'), $plugin));
+	else
+		register_error(sprintf(elgg_echo('admin:plugins:reorder:no'), $plugin));		
+		
 	elgg_view_regenerate_simplecache();
-	elgg_filepath_cache_reset();

-		

-	forward($_SERVER['HTTP_REFERER']);

-

+	elgg_filepath_cache_reset();
+		
+	forward($_SERVER['HTTP_REFERER']);
+
 ?>
\ No newline at end of file