Modified Talk to take a variable number of arguments.

appleseedproj · Mar 13, 2011 · c481c96 · c481c96
1 parent 9033880
commit c481c96
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/system/component.php b/system/component.php
@@ -207,8 +207,14 @@ private function _LoadController ( $pController = null ) {
 		return ( true );
 	}
 
-	public function Talk ( $pComponent, $pRequest, $pData = null ) {
-		return ( $this->GetSys ( "Components" )->Talk ( $pComponent, $pRequest, $pData ) );
+	public function Talk ( $pComponent, $pRequest ) {
+
+      	$args = func_get_args();
+		$Components = Wob::_('Components' );
+
+	    $return = call_user_func_array ( array ( $Components, 'Talk' ), $args );
+
+		return ( $return );
 	}
 
 }
diff --git a/system/components.php b/system/components.php
@@ -316,7 +316,12 @@ public function Buffer ( $pComponent, $pController = null, $pView = null, $pTask
 		return ( $return );
 	}
 
-	public function Talk ( $pComponent, $pRequest, $pData = null ) {
+	public function Talk ( $pComponent, $pRequest ) {
+
+      	$args = func_get_args();
+
+		unset ( $args[0] );
+		unset ( $args[1] );
 
 		$component = ucwords ( strtolower ( ltrim ( rtrim ( $pComponent ) ) ) );
 		$function = ltrim ( rtrim ( $pRequest ) );
@@ -330,7 +335,9 @@ public function Talk ( $pComponent, $pRequest, $pData = null ) {
 		if ( !$methods ) return ( false );
 
 		if ( in_array ( $function, $methods) ) {
-			return ( $this->$component->$function ( $pData ) );
+	    	$return = call_user_func_array ( array ( $this->$component, $function ), $args );
+
+			return ( $return );
 		}
 
 		return ( false );

diff --git a/system/controller.php b/system/controller.php
@@ -241,10 +241,13 @@ function EventTrigger ( string $pEvent, array $pData = null) {
 	 * @param string $pEvent Which event to trigger
 	 * @param array $pEvent Extra data to pass to event hook
 	 */
-	public function Talk ( $pComponent, $pRequest, $pData = null ) {
-
-		$return = $this->GetSys ( "Components" )->Talk ( $pComponent, $pRequest, $pData );
+	public function Talk ( $pComponent, $pRequest ) {
 
+      	$args = func_get_args();
+		$Components = Wob::_('Components' );
+
+	    $return = call_user_func_array ( array ( $Components, 'Talk' ), $args );
+
 		return ( $return );
 	}