From 8fd7f6e98053c443b9dd86df84e19ff555833ffd Mon Sep 17 00:00:00 2001
From: ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 4 Jun 2008 14:46:47 +0000
Subject: Fixed actions issues

git-svn-id: https://code.elgg.org/elgg/trunk@796 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/actions.php  |  4 ++--
 engine/lib/install.php  | 10 +++++++++-
 engine/lib/sessions.php |  9 ++++-----
 engine/lib/users.php    |  6 +++---
 4 files changed, 18 insertions(+), 11 deletions(-)

(limited to 'engine')

diff --git a/engine/lib/actions.php b/engine/lib/actions.php
index f3d3c445b..ee8c1b09d 100644
--- a/engine/lib/actions.php
+++ b/engine/lib/actions.php
@@ -74,7 +74,7 @@
         
         function register_action($action, $public = false, $filename = "") {
             global $CONFIG;            
-
+            
             if (!isset($CONFIG->actions)) {
                 $CONFIG->actions = array();
             }
@@ -85,7 +85,7 @@
             	
                 $filename = $path . "actions/" . $action . ".php";
             }
-
+            
             $CONFIG->actions[$action] = array('file' => $filename, 'public' => $public);
             return true;
         }
diff --git a/engine/lib/install.php b/engine/lib/install.php
index 2a9026959..a4d2f5933 100644
--- a/engine/lib/install.php
+++ b/engine/lib/install.php
@@ -42,6 +42,14 @@
 			
 		}
 		
-		register_action("systemsettings/install",true);
+	/**
+	 * Initialisation for installation functions
+	 *
+	 */
+		function install_init() {
+			register_action("systemsettings/install",true);			
+		}
+		
+		register_event_handler("boot","system","install_init");
 		
 ?>
\ No newline at end of file
diff --git a/engine/lib/sessions.php b/engine/lib/sessions.php
index c302ed3cc..2995c1723 100644
--- a/engine/lib/sessions.php
+++ b/engine/lib/sessions.php
@@ -172,6 +172,10 @@
 	        if ($_SESSION['id'] > 0) {
 	            // set_last_action($_SESSION['id']);
 	        }
+	        
+	        register_action("login",true);
+    		register_action("logout");
+	        
 		}
 
 	/**
@@ -183,11 +187,6 @@
 		}
 		
 		register_event_handler("boot","system","session_init",1);
-	
-	//register actions *************************************************************
-   
-   		register_action("login",true);
-    	register_action("logout");
 
 
 ?>
\ No newline at end of file
diff --git a/engine/lib/users.php b/engine/lib/users.php
index a4a9bded4..f9fc09ae0 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -689,14 +689,14 @@
 		
 		register_page_handler('friends','friends_page_handler');
 		register_page_handler('friendsof','friends_of_page_handler');
+		register_action("register",true);
+   		register_action("friends/add");
+   		register_action("friends/remove");
 		
 	}
 	
 	//register actions *************************************************************
    
-   		register_action("register",true);
-   		register_action("friends/add");
-   		register_action("friends/remove");
    		register_event_handler('init','system','users_init',0);
 	
 ?>
\ No newline at end of file
-- 
cgit v1.2.3