OSDN Git Service

(root) / pukiwiki / pukiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dc444db)
BugTrack/578 Added $javascript at pukiwiki.ini.php, to on/off <meta> header
authorhenoheno <henoheno>
Sat, 16 Oct 2004 04:14:00 +0000 (13:14 +0900)
committerhenoheno <henoheno>
Sat, 16 Oct 2004 04:14:00 +0000 (13:14 +0900)
lib/html.php patch | blob | history
pukiwiki.ini.php patch | blob | history
skin/pukiwiki.skin.php patch | blob | history

diff --git a/lib/html.php b/lib/html.php
index e601272..d00ba06 100644 (file)
--- a/lib/html.php
+++ b/lib/html.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: html.php,v 1.7 2004/10/16 01:18:58 henoheno Exp $
+// $Id: html.php,v 1.8 2004/10/16 04:14:00 henoheno Exp $
 //
 
 // ËÜʸ¤ò½ÐÎÏ
@@ -10,7 +10,7 @@ function catbody($title,$page,$body)
 {
        global $script, $vars, $arg, $defaultpage, $whatsnew, $help_page, $hr;
        global $related_link, $cantedit, $function_freeze, $search_word_color, $_msg_word;
-       global $foot_explain, $note_hr, $head_tags, $trackback, $referer;
+       global $foot_explain, $note_hr, $head_tags, $trackback, $referer, $javascript;
        global $_LANG, $_LINK, $_IMAGE;
 
        global $html_transitional; // FALSE:XHTML1.1 TRUE:XHTML1.0 Transitional
@@ -24,6 +24,11 @@ function catbody($title,$page,$body)
 
        $_LANG = $_LINK = $_IMAGE = array();
 
+       // Add script header when ...
+       if ($trackback) {
+               $javascript = 1;
+       }
+
        $_page  = isset($vars['page']) ? $vars['page'] : '';
        $r_page = rawurlencode($_page);
 
diff --git a/pukiwiki.ini.php b/pukiwiki.ini.php
index 3038267..e52a443 100644 (file)
--- a/pukiwiki.ini.php
+++ b/pukiwiki.ini.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: pukiwiki.ini.php,v 1.86 2004/10/01 12:10:37 henoheno Exp $
+// $Id: pukiwiki.ini.php,v 1.87 2004/10/16 04:14:00 henoheno Exp $
 //
 // PukiWiki setting file
 
@@ -92,6 +92,12 @@ $trackback = 0;
 $referer = 0;
 
 /////////////////////////////////////////////////
+// Script¤ËJavaScript¤ò»ÈÍѤ¹¤ë (¾ï¤Ë¥Ø¥Ã¥À¤ò½ÐÎϤ¹¤ë)
+// $trackback¤Ê¤É¡¢¤¤¤¯¤Ä¤«¤ÎÀßÄê¤Ë¤è¤Ã¤Æ¤Ï
+// ¼«Æ°Åª¤Ëon¤Ë¤Ê¤ê¤Þ¤¹
+$javascript = 0;
+
+/////////////////////////////////////////////////
 // WikiName¤ò *̵¸ú¤Ë* ¤¹¤ë
 $nowikiname = 0;
 
diff --git a/skin/pukiwiki.skin.php b/skin/pukiwiki.skin.php
index 295e47c..1db0010 100644 (file)
--- a/skin/pukiwiki.skin.php
+++ b/skin/pukiwiki.skin.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: pukiwiki.skin.php,v 1.10 2004/10/12 11:11:56 henoheno Exp $
+// $Id: pukiwiki.skin.php,v 1.11 2004/10/16 04:14:00 henoheno Exp $
 //
 
 // Prohibit direct access
@@ -63,19 +63,14 @@ if ($html_transitional) { ?>
 <head>
  <meta http-equiv="content-type" content="application/xhtml+xml; charset=<?php echo CONTENT_CHARSET ?>" />
  <meta http-equiv="content-style-type" content="text/css" />
-
-<?php if (! $is_read) { ?>
- <meta name="robots" content="NOINDEX,NOFOLLOW" />
-<?php } ?>
+<?php if (! $is_read)  { ?> <meta name="robots" content="NOINDEX,NOFOLLOW" /><?php } ?>
+<?php if ($javascript) { ?> <meta http-equiv="Content-Script-Type" content="text/javascript" /><?php } ?>
 
  <title><?php echo "$title - $page_title" ?></title>
  <link rel="stylesheet" href="skin/pukiwiki.css.php?charset=<?php echo $css_charset ?>" type="text/css" media="screen" charset="<?php echo $css_charset ?>" />
  <link rel="stylesheet" href="skin/pukiwiki.css.php?charset=<?php echo $css_charset ?>&amp;media=print" type="text/css" media="print" charset="<?php echo $css_charset ?>" />
 
-<?php if ($trackback) { ?>
- <meta http-equiv="Content-Script-Type" content="text/javascript" />
- <script type="text/javascript" src="skin/trackback.js"></script>
-<?php } ?>
+<?php if ($trackback) { ?> <script type="text/javascript" src="skin/trackback.js"></script><?php } ?>
 
 <?php echo $head_tag ?>
 </head>
About OSDN
Find Software
Develop Software
Help