Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[6588] trunk/themes
|
From: <var...@us...> - 2009-02-26 20:13:30
|
Revision: 6588
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6588&view=rev
Author: vargenau
Date: 2009-02-26 20:13:23 +0000 (Thu, 26 Feb 2009)
Log Message:
-----------
Fix ROBOTS_META warning
Modified Paths:
--------------
trunk/themes/Crao/templates/head.tmpl
trunk/themes/wikilens/templates/head.tmpl
Modified: trunk/themes/Crao/templates/head.tmpl
===================================================================
--- trunk/themes/Crao/templates/head.tmpl 2009-02-26 19:51:27 UTC (rev 6587)
+++ trunk/themes/Crao/templates/head.tmpl 2009-02-26 20:13:23 UTC (rev 6588)
@@ -3,7 +3,7 @@
?>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=<?=CHARSET?>" />
-<?php $ROBOTS_CONTENT = $ROBOTS_META ? $ROBOTS_META : "noindex,nofollow"; ?>
+<?php $ROBOTS_CONTENT = isset($ROBOTS_META) ? $ROBOTS_META : "noindex,nofollow"; ?>
<meta name="robots" content="<?= $ROBOTS_CONTENT ?>" />
<?php if (!empty($PAGE_DESCRIPTION)) { ?>
<meta name="description" content="<?=$PAGE_DESCRIPTION?>" />
@@ -111,69 +111,3 @@
<title><?=WIKI_NAME.$pagetitle?></title>
<?= $WikiTheme->getMoreHeaders() ?>
</head>
-<?php
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-// $Log: not supported by cvs2svn $
-// Revision 1.3 2004/06/04 20:34:11 rurban
-// Put several _("") into new lines if inside attr="", so that xgettext
-// can pick it up. (Suggested by Pierrick Meignen)
-//
-// Revision 1.2 2004/06/03 12:30:38 rurban
-// support edit_toolbar in other themes
-//
-// Revision 1.1 2004/05/12 19:42:16 rurban
-// new Crao theme by Arnaud Fontaine and Laurent Lunati
-//
-// Revision 1.13 2003/12/05 15:36:39 carstenklapp
-// Improvements: to make it easier to run multiple wikis off of one set
-// of code, urls for link rel author and copyright now defined in
-// index.php.
-// Bugfix: updated language meta tag to use DEFAULT_LANGUAGE constant
-// instead of old LANG global.
-// Internal change: Eliminated RECENT_CHANGES constant from RSS link,
-// just use the easily localizable _("RecentChanges").
-// Typo fixed.
-//
-// Revision 1.12 2003/11/22 17:58:43 carstenklapp
-// Minor internal change: Removed redundant call to gettext within
-// fmt(). (locale make: head.tmpl:49: warning: keyword nested in keyword
-// arg)
-//
-// Revision 1.11 2003/11/21 23:06:12 carstenklapp
-// Bugfix: Some <link rel=...> links in Mozilla/iCab were always linking
-// to the english pages even when DEFAULT_LANGUAGE != 'en'. (Rewrapped
-// text for a more complete xgettext string extraction: 'cd
-// phpwiki/locale;make' to update po/mo files).
-//
-// Revision 1.10 2003/03/07 20:51:59 dairiki
-// New feature: Automatic extraction of keywords (for the meta keywords tag)
-// from Category* and Topic* links on each page.
-//
-// Revision 1.9 2003/03/07 02:45:51 dairiki
-// Rename BASE_URL to PHPWIKI_BASE_URL. Lycos pre-defines BASE_URL (to
-// the wrong thing).
-//
-// Revision 1.8 2003/03/05 21:38:15 dairiki
-// More HTML comment reduction patches by "Klaus-Guenter Leiss"
-// <Lei...@ep...>
-//
-// (With a few adjustments by me. Any bugs are probably my fault.)
-//
-// Revision 1.7 2003/02/26 22:27:17 dairiki
-// Fix and refactor FrameInclude plugin (more or less).
-//
-// (This should now generate valid HTML. Woohoo!)
-//
-// The output when using the Sidebar theme is ugly enough that it should
-// be considered broken. (But the Sidebar theme appears pretty broken in
-// general right now.)
-//
-// (Personal comment (not to be taken personally): I must say that I
-// remain unconvinced of the usefulness of this plugin.)
-//
-// Revision 1.6 2003/01/11 22:29:47 carstenklapp
-// Tweak redundant bookmark title when browsing a custom home page with
-// the same name as the wiki (i.e. avoid titles like "MyWiki - MyWiki"
-// when HOME_PAGE==WIKI_NAME)
-//
-?>
Modified: trunk/themes/wikilens/templates/head.tmpl
===================================================================
--- trunk/themes/wikilens/templates/head.tmpl 2009-02-26 19:51:27 UTC (rev 6587)
+++ trunk/themes/wikilens/templates/head.tmpl 2009-02-26 20:13:23 UTC (rev 6588)
@@ -3,7 +3,7 @@
?>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=<?=CHARSET?>" />
-<?php $ROBOTS_CONTENT = $ROBOTS_META ? $ROBOTS_META : "noindex,nofollow"; ?>
+<?php $ROBOTS_CONTENT = isset($ROBOTS_META) ? $ROBOTS_META : "noindex,nofollow"; ?>
<meta name="robots" content="<?= $ROBOTS_CONTENT ?>" />
<?php if (!empty($PAGE_DESCRIPTION)) { ?>
<meta name="description" content="<?=$PAGE_DESCRIPTION?>" />
@@ -117,70 +117,3 @@
?>
<?= $WikiTheme->getMoreHeaders() ?>
</head>
-
-<?php
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-// $Log: not supported by cvs2svn $
-// Revision 1.2 2004/06/04 20:34:11 rurban
-// Put several _("") into new lines if inside attr="", so that xgettext
-// can pick it up. (Suggested by Pierrick Meignen)
-//
-// Revision 1.1 2004/03/30 02:40:07 rurban
-// sample theme needed for RateIt
-//
-// Revision 1.14 2004/02/17 12:19:49 rurban
-// support to add more javascript dynamically
-//
-// Revision 1.13 2003/12/05 15:36:39 carstenklapp
-// Improvements: to make it easier to run multiple wikis off of one set
-// of code, urls for link rel author and copyright now defined in
-// index.php.
-// Bugfix: updated language meta tag to use DEFAULT_LANGUAGE constant
-// instead of old LANG global.
-// Internal change: Eliminated RECENT_CHANGES constant from RSS link,
-// just use the easily localizable _("RecentChanges").
-// Typo fixed.
-//
-// Revision 1.12 2003/11/22 17:58:43 carstenklapp
-// Minor internal change: Removed redundant call to gettext within
-// fmt(). (locale make: head.tmpl:49: warning: keyword nested in keyword
-// arg)
-//
-// Revision 1.11 2003/11/21 23:06:12 carstenklapp
-// Bugfix: Some <link rel=...> links in Mozilla/iCab were always linking
-// to the english pages even when DEFAULT_LANGUAGE != 'en'. (Rewrapped
-// text for a more complete xgettext string extraction: 'cd
-// phpwiki/locale;make' to update po/mo files).
-//
-// Revision 1.10 2003/03/07 20:51:59 dairiki
-// New feature: Automatic extraction of keywords (for the meta keywords tag)
-// from Category* and Topic* links on each page.
-//
-// Revision 1.9 2003/03/07 02:45:51 dairiki
-// Rename BASE_URL to PHPWIKI_BASE_URL. Lycos pre-defines BASE_URL (to
-// the wrong thing).
-//
-// Revision 1.8 2003/03/05 21:38:15 dairiki
-// More HTML comment reduction patches by "Klaus-Guenter Leiss"
-// <Lei...@ep...>
-//
-// (With a few adjustments by me. Any bugs are probably my fault.)
-//
-// Revision 1.7 2003/02/26 22:27:17 dairiki
-// Fix and refactor FrameInclude plugin (more or less).
-//
-// (This should now generate valid HTML. Woohoo!)
-//
-// The output when using the Sidebar theme is ugly enough that it should
-// be considered broken. (But the Sidebar theme appears pretty broken in
-// general right now.)
-//
-// (Personal comment (not to be taken personally): I must say that I
-// remain unconvinced of the usefulness of this plugin.)
-//
-// Revision 1.6 2003/01/11 22:29:47 carstenklapp
-// Tweak redundant bookmark title when browsing a custom home page with
-// the same name as the wiki (i.e. avoid titles like "MyWiki - MyWiki"
-// when HOME_PAGE==WIKI_NAME)
-//
-?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
