/////////////////////////////////////////////////
// PukiWiki - Yet another WikiWikiWeb clone.
//
-// $Id: ref.inc.php,v 1.24 2004/08/18 13:14:53 henoheno Exp $
+// $Id: ref.inc.php,v 1.25 2004/08/18 13:28:25 henoheno Exp $
//
/*
function plugin_ref_inline()
{
- global $vars;
-
// Not reached, because of "$aryargs[] = & $body" at plugin.php
// if (! func_num_args()) return '&ref(): No arguments;';
- $params = plugin_ref_body(func_get_args(), $vars['page']);
+ $params = plugin_ref_body(func_get_args());
if (isset($params['_error']) && $params['_error'] != '') {
return '&ref(): ' . $params['_error'] . ';';
function plugin_ref_convert()
{
- global $vars;
-
if (! func_num_args()) return '<p>#ref(): No arguments</p>';
- $params = plugin_ref_body(func_get_args(), $vars['page']);
+ $params = plugin_ref_body(func_get_args());
if (isset($params['_error']) && $params['_error'] != '') {
return "<p>#ref(): {$params['_error']}</p>";
return "<div class=\"img_margin\" style=\"$style\">{$params['_body']}</div>\n";
}
-function plugin_ref_body($args, $page)
+function plugin_ref_body($args)
{
- global $script, $WikiName, $BracketName;
+ global $script, $vars, $WikiName, $BracketName;
- // Ìá¤êÃÍ
- $params = array();
+ $params = array(); // Ìá¤êÃÍ
+ $page = isset($vars['page']) ? $vars['page'] : '';
// źÉÕ¥Õ¥¡¥¤¥ë̾¤ò¼èÆÀ
$name = array_shift($args);
);
if (! empty($args)) {
- foreach ($args as $key=>$val) {
- ref_check_arg($val, $key, $params);
+ foreach ($args as $arg) {
+ ref_check_arg($arg, $params);
}
}
//-----------------------------------------------------------------------------
// ¥ª¥×¥·¥ç¥ó¤ò²òÀϤ¹¤ë
-function ref_check_arg($val, $_key, & $params)
+function ref_check_arg($val, & $params)
{
if ($val == '') {
$params['_done'] = TRUE;