[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[15917] trunk/lib/smarty_tiki

[<ny...@us...>]

Revision: 15917
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=15917&view=rev
Author:   nyloth
Date:     2008-12-05 17:38:41 +0000 (Fri, 05 Dec 2008)

Log Message:
-----------
[FIX][MOD] self_link and query smarty plugins: correctly handle new xajax libs + add a _style param to self_link.

Modified Paths:
--------------
    trunk/lib/smarty_tiki/block.self_link.php
    trunk/lib/smarty_tiki/function.query.php

Modified: trunk/lib/smarty_tiki/block.self_link.php
===================================================================
--- trunk/lib/smarty_tiki/block.self_link.php	2008-12-05 17:36:31 UTC (rev 15916)
+++ trunk/lib/smarty_tiki/block.self_link.php	2008-12-05 17:38:41 UTC (rev 15917)
@@ -39,10 +39,6 @@
 
     if ( is_array($params) ) {
 
-			if ( isset($params['xajax']) ) {
-				$params['xajaxargs'] = $params['xajaxr'] = $params['xajax'] = 'NULL';
-			}
-
       if ( ! isset($content) ) $content = '';
       if ( ! isset($params['_ajax']) ) $params['_ajax'] = 'y';
       if ( ! isset($params['_script']) ) $params['_script'] = '';
@@ -114,6 +110,7 @@
         }
 
         $link = ( ( isset($params['_class']) && $params['_class'] != '' ) ? 'class="'.$params['_class'].'" ' : '' )
+              . ( ( isset($params['_style']) && $params['_style'] != '' ) ? 'style="'.$params['_style'].'" ' : '' )
               . ( ( isset($params['_title']) && $params['_title'] != '' ) ? 'title="'.str_replace('"','\"',$params['_title']).'" ' : '' );
 				foreach ( $params as $k => $v ) {
 					if ( strlen($k) > 3 && substr($k, 0, 3) == '_on' ) {

Modified: trunk/lib/smarty_tiki/function.query.php
===================================================================
--- trunk/lib/smarty_tiki/function.query.php	2008-12-05 17:36:31 UTC (rev 15916)
+++ trunk/lib/smarty_tiki/function.query.php	2008-12-05 17:38:41 UTC (rev 15917)
@@ -13,7 +13,7 @@
 	if ( isset($params['_noauto']) && $params['_noauto'] == 'y' ) {
 		$query = array();
 		foreach( $params as $param_name => $param_value ) {
-			if ( $param_name[0] == '_' ) continue;
+			if ( $param_name[0] == '_' || $param_value == 'NULL' || $param_value == NULL ) continue;
 			$query[$param_name] = $param_value;
 		}
 		// Even if _noauto is set, 'filegals_manager' is a special param that has to be kept all the time
@@ -22,12 +22,18 @@
 		}
 	} else {
 		// Not using _REQUEST here, because it is sometimes directly modified in scripts
-		if ( $request === NULL ) $request = array_merge($_GET, $_POST);
+		if ( $request === NULL ) {
+			$request = array_merge($_GET, $_POST);
+
+			// Remove Xajax special arguments
+			foreach ( array('xjxargs', 'xjxr', 'xjx', 'xjxfun', 'xjxr') as $k ) {
+				unset($request[$k]);
+			}
+		}
 		$query = $request;
 
 		if ( is_array($params) ) {
 			foreach( $params as $param_name => $param_value ) {
-	
 				// Arguments starting with an underscore are special and must not be included in URL
 				if ( $param_name[0] == '_' ) continue;
 	


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.