[Tikiwiki-cvs] tiki/lib tikilib.php,1.59,1.60

[<lra...@us...>]

Update of /cvsroot/tikiwiki/tiki/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv7476/lib

Modified Files:
	tikilib.php 
Log Message:
Wiki Plugins fixed


Index: tikilib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/tikilib.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- tikilib.php	7 Jan 2003 15:38:15 -0000	1.59
+++ tikilib.php	7 Jan 2003 22:25:46 -0000	1.60
@@ -8006,7 +8006,8 @@
     }
     
     // Now search for plugins
-    preg_match_all("/\{([A-Z]+)\(([^\)]+)\)\}/",$data,$plugins);
+    preg_match_all("/\{([A-Z]+)\(([^\)]*)\)\}/",$data,$plugins);
+    //print_r($plugins);
     for($i=0;$i<count($plugins[0]);$i++) {
       $plugin_start = $plugins[0][$i];
       $plugin_end = '{'.$plugins[1][$i].'}';
@@ -8017,12 +8018,15 @@
         $plugin_data = substr($data,$pos+strlen($plugin_start),$plugin_data_len);
         $php_name = 'lib/wiki-plugins/wikiplugin_'.strtolower($plugins[1][$i]).'.php';
         $func_name = 'wikiplugin_'.strtolower($plugins[1][$i]);
-        $params = split(',',$plugins[2][$i]);
+        $params = split(',',trim($plugins[2][$i]));
         $arguments=Array();
+        
         foreach($params as $param) {
           $parts=explode('=>',$param);
-          $name=trim($parts[0]);
-          $arguments[$name]=trim($parts[1]);
+          if(isset($parts[0])&&isset($parts[1])) {
+            $name=trim($parts[0]);
+            $arguments[$name]=trim($parts[1]);
+          }
         }
         if(file_exists($php_name)) {
           include_once($php_name);