0
@@ -121,7 +121,7 @@ class Events
0
       {
0
         if( isset( $row['tag_name'] ) && $row['tag_name'] != '' )
0
         {
0
-					$this->CallUserTag( $row['tag_name'], $params );
0
+					UserTags::CallUserTag( $row['tag_name'], $params );
0
         }
0
         else if( isset( $row['module_name'] ) && $row['module_name'] != '' )
0
         {

0
@@ -2900,38 +2900,12 @@ class CMSModule
0
   
0
   function ListUserTags()
0
   {
0
-		global $gCms;
0
-		$db =& $this->GetDb();
0
-		
0
-		$plugins = array();
0
-		
0
-		$query = 'SELECT userplugin_name FROM '.cms_db_prefix().'userplugins ORDER BY userplugin_name';
0
-		$result = &$db->Execute($query);
0
-
0
-		while ($result && !$result->EOF)
0
-		{
0
-			$plugins[$result->fields['userplugin_name']] =& $result->fields['userplugin_name'];
0
-			$result->MoveNext();
0
-		}
0
-		
0
-		return $plugins;
0
+		return UserTags::ListUserTags();
0
   }
0
   
0
   function CallUserTag($name, $params = array())
0
   {
0
-		global $gCms;
0
-		$smarty =& $this->smarty;
0
-		$userpluginfunctions =& $gCms->userpluginfunctions;
0
-		
0
-		$result = '';
0
-		
0
-		if ($userpluginfunctions[$name] && function_exists($userpluginfunctions[$name]))
0
-		{
0
-			$functionname = $userpluginfunctions[$name];
0
-			$result = call_user_func_array($functionname, array($params, &$smarty));
0
-		}
0
-		
0
-		return $result;
0
+		return UserTags::CallUserTag($name, $params);
0
   }
0
 
0
   /**

0
@@ -142,6 +142,23 @@ class UserTags
0
 
0
     return $plugins;
0
   }
0
+	
0
+	function CallUserTag($name, $params = array())
0
+	{
0
+		global $gCms;
0
+		$smarty =& $gCms->GetSmarty();
0
+		$userpluginfunctions =& $gCms->userpluginfunctions;
0
+		
0
+		$result = '';
0
+		
0
+		if ($userpluginfunctions[$name] && function_exists($userpluginfunctions[$name]))
0
+		{
0
+			$functionname = $userpluginfunctions[$name];
0
+			$result = call_user_func_array($functionname, array($params, &$smarty));
0
+		}
0
+		
0
+		return $result;
0
+	}
0
 
0
 } // class
0
 # vim:ts=4 sw=4 noet