[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[27502] trunk/lib/wiki-plugins/wikiplugin_transclude. php

[<ja...@us...>]

Revision: 27502
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=27502&view=rev
Author:   jacmoe2
Date:     2010-06-05 10:55:44 +0000 (Sat, 05 Jun 2010)

Log Message:
-----------
[MOD] Plugin transclude: allow data to be wrapped by text parameter

Modified Paths:
--------------
    trunk/lib/wiki-plugins/wikiplugin_transclude.php

Modified: trunk/lib/wiki-plugins/wikiplugin_transclude.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_transclude.php	2010-06-05 08:51:39 UTC (rev 27501)
+++ trunk/lib/wiki-plugins/wikiplugin_transclude.php	2010-06-05 10:55:44 UTC (rev 27502)
@@ -10,7 +10,6 @@
 		'name' => tra('Transclusion'),
 		'description' => tra('Includes the content of a wiki page and replaces values in the body of the included page. All additional parameters will be replaced. For example %%%title%%% will be replaced with the parameter title in the plugin.'),
 		'prefs' => array('wikiplugin_transclude', 'feature_wiki'),
-		'filter' => 'alpha',
 		'extraparams' => true,
 		'defaultfilter' => 'text',
 		'params' => array(
@@ -53,10 +52,17 @@
 	}
 
 	if( $info = $tikilib->get_page_info( $page ) ) {
+		$parts = preg_split('/%%%text%%%/', $info['data']);
+		$lines = explode("\n", $data);
+		$data = '';
+		foreach ($lines as $line) {
+			$data .= $line . "<br/>";
+		}
+		$pass = $parts[0] . $data . $parts[1];
 		return preg_replace_callback(
-			'/%%%([\w-]+)%%%/',
+			'/%%%([A-z0-9]+)%%%/',
 			array( new WikiPlugin_Transclude_Replacer( $params ), 'callback' ),
-			$info['data']
+			$pass
 		);
 	} else {
 		return WikiParser_PluginOutput::error( tr('Page not found'), tr('Page named "%0" does not exist at this time.', $page ) );


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