[phpwiki-checkins] SF.net SVN: phpwiki:[7834] trunk

[<var...@us...>]

Revision: 7834
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7834&view=rev
Author:   vargenau
Date:     2011-01-13 15:38:07 +0000 (Thu, 13 Jan 2011)

Log Message:
-----------
Include open graph only if needed (to get valid XHTML code)

Modified Paths:
--------------
    trunk/config/config-default.ini
    trunk/config/config-dist.ini
    trunk/configurator.php
    trunk/themes/Crao/templates/head.tmpl
    trunk/themes/default/templates/head.tmpl
    trunk/themes/wikilens/templates/head.tmpl

Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2011-01-13 15:06:45 UTC (rev 7833)
+++ trunk/config/config-default.ini	2011-01-13 15:38:07 UTC (rev 7834)
@@ -9,6 +9,7 @@
 JS_SEARCHREPLACE = true
 ENABLE_DOUBLECLICKEDIT = false
 ENABLE_XHTML_XML = false
+ENABLE_OPEN_GRAPH = false
 USECACHE = true
 READONLY = false
 

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2011-01-13 15:06:45 UTC (rev 7833)
+++ trunk/config/config-dist.ini	2011-01-13 15:38:07 UTC (rev 7834)
@@ -86,6 +86,9 @@
 ; See http://hixie.ch/advocacy/xhtml
 ;ENABLE_XHTML_XML = true
 
+; Needed for FacebookLike plugin
+;ENABLE_OPEN_GRAPH = true
+
 ; Needs babycart installed. See http://phpwiki.org/SpamAssassinIntegration
 ; Optionally define BABYCART_PATH. Default: /usr/local/bin/babycart
 ;ENABLE_SPAMASSASSIN = true

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2011-01-13 15:06:45 UTC (rev 7833)
+++ trunk/configurator.php	2011-01-13 15:38:07 UTC (rev 7834)
@@ -393,6 +393,9 @@
 $properties["ENABLE_XHTML_XML"] =
 new boolean_define_commented_optional('ENABLE_XHTML_XML');
 
+$properties["ENABLE_OPEN_GRAPH"] =
+new boolean_define_commented_optional('ENABLE_OPEN_GRAPH');
+
 $properties["ENABLE_SPAMASSASSIN"] =
 new boolean_define_commented_optional('ENABLE_SPAMASSASSIN');
 

Modified: trunk/themes/Crao/templates/head.tmpl
===================================================================
--- trunk/themes/Crao/templates/head.tmpl	2011-01-13 15:06:45 UTC (rev 7833)
+++ trunk/themes/Crao/templates/head.tmpl	2011-01-13 15:38:07 UTC (rev 7834)
@@ -103,7 +103,9 @@
       $pagetitle = " - ". AsString($TITLE);
 ?>
 <title><?php echo WIKI_NAME.$pagetitle?></title>
+<?php if (ENABLE_OPEN_GRAPH) { ?>
 <meta property="og:title" content="<?php echo strip_tags($TITLE) ?>"/>
 <meta property="og:site_name" content="<?php echo WIKI_NAME ?>"/>
+<?php } ?>
 <?php echo $WikiTheme->getMoreHeaders() ?>
 </head>

Modified: trunk/themes/default/templates/head.tmpl
===================================================================
--- trunk/themes/default/templates/head.tmpl	2011-01-13 15:06:45 UTC (rev 7833)
+++ trunk/themes/default/templates/head.tmpl	2011-01-13 15:38:07 UTC (rev 7834)
@@ -110,7 +110,9 @@
       $pagetitle = " - ". AsString($TITLE);
 ?>
 <title><?php echo WIKI_NAME.$pagetitle ?></title>
+<?php if (ENABLE_OPEN_GRAPH) { ?>
 <meta property="og:title" content="<?php echo strip_tags($TITLE) ?>"/>
 <meta property="og:site_name" content="<?php echo WIKI_NAME ?>"/>
+<?php } ?>
 <?php echo $WikiTheme->getMoreHeaders() ?>
 </head>

Modified: trunk/themes/wikilens/templates/head.tmpl
===================================================================
--- trunk/themes/wikilens/templates/head.tmpl	2011-01-13 15:06:45 UTC (rev 7833)
+++ trunk/themes/wikilens/templates/head.tmpl	2011-01-13 15:38:07 UTC (rev 7834)
@@ -103,8 +103,10 @@
       $pagetitle = " - ". AsString($TITLE);
 ?>
 <title><?php echo WIKI_NAME.$pagetitle ?></title>
+<?php if (ENABLE_OPEN_GRAPH) { ?>
 <meta property="og:title" content="<?php echo strip_tags($TITLE) ?>"/>
 <meta property="og:site_name" content="<?php echo WIKI_NAME ?>"/>
+<?php } ?>
 <?php
   require_once("lib/plugin/RateIt.php");
   $plugin = new WikiPlugin_RateIt;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.