[phpwiki-checkins] SF.net SVN: phpwiki:[10858] trunk/themes

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

Revision: 10858
          http://sourceforge.net/p/phpwiki/code/10858
Author:   vargenau
Date:     2022-01-06 17:28:01 +0000 (Thu, 06 Jan 2022)
Log Message:
-----------
templates: DEBUG is always defined

Modified Paths:
--------------
    trunk/themes/Crao/templates/bottom.tmpl
    trunk/themes/MonoBook/templates/info.tmpl
    trunk/themes/blog/templates/bottom.tmpl
    trunk/themes/default/templates/bottom.tmpl
    trunk/themes/fusionforge/templates/bottom.tmpl
    trunk/themes/smaller/templates/info.tmpl

Modified: trunk/themes/Crao/templates/bottom.tmpl
===================================================================
--- trunk/themes/Crao/templates/bottom.tmpl	2022-01-06 16:38:54 UTC (rev 10857)
+++ trunk/themes/Crao/templates/bottom.tmpl	2022-01-06 17:28:01 UTC (rev 10858)
@@ -1,7 +1,11 @@
 <footer role="contentinfo">
 <?php // Add your Disclaimer here ?>
 <?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?>
-<?php if (defined('DEBUG') and DEBUG) { ?><?php echo Template('debug') ?><?php } ?>
+<?php
+if (DEBUG) {
+    echo Template('debug');
+}
+?>
 </footer>
 <script type="text/javascript" src="<?php echo DATA_PATH ?>/themes/default/highlight.js/highlight.pack.js"></script>
 <script>

Modified: trunk/themes/MonoBook/templates/info.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/info.tmpl	2022-01-06 16:38:54 UTC (rev 10857)
+++ trunk/themes/MonoBook/templates/info.tmpl	2022-01-06 17:28:01 UTC (rev 10858)
@@ -174,16 +174,15 @@
     <?php echo $SEP?><?php echo Button("Diff") ?>
     <?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'minor'),_("Diff previous Revision"),$page->getName()) ?>
     <?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'author'),_("Diff previous Author"),$page->getName()) ?>
-<?php if ((defined('DEBUG') && DEBUG) || $user->isAdmin()) { ?>
+<?php if (DEBUG || $user->isAdmin()) { ?>
     <?php // Buttons really only for debugging ?>
     <?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("Debug Backend Info")) ?>
 <?php
-     $PurgeCache = Button(array('nocache' => 'purge'),
+    $PurgeCache = Button(array('nocache' => 'purge'),
                      _("Purge HTML cache"), $page->getName());
-     $PurgeCache->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."));
+    $PurgeCache->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."));
 ?>
     <?php echo $SEP?><?php echo $PurgeCache ?>
-
     <?php // End debugging buttons ?>
 <?php } ?>
 </div>

Modified: trunk/themes/blog/templates/bottom.tmpl
===================================================================
--- trunk/themes/blog/templates/bottom.tmpl	2022-01-06 16:38:54 UTC (rev 10857)
+++ trunk/themes/blog/templates/bottom.tmpl	2022-01-06 17:28:01 UTC (rev 10858)
@@ -1,7 +1,11 @@
 <?php // Add your Disclaimer here ?>
 <?php if (!$WikiTheme->DUMP_MODE) { ?>
 <?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?>
-<?php if (DEBUG & _DEBUG_VERBOSE) { ?><?php echo Template('debug') ?><?php } ?>
+<?php
+if (DEBUG) {
+    echo Template('debug');
+}
+?>
 <?php } ?>
 <script type="text/javascript" src="<?php echo DATA_PATH ?>/themes/default/highlight.js/highlight.pack.js"></script>
 <script>

Modified: trunk/themes/default/templates/bottom.tmpl
===================================================================
--- trunk/themes/default/templates/bottom.tmpl	2022-01-06 16:38:54 UTC (rev 10857)
+++ trunk/themes/default/templates/bottom.tmpl	2022-01-06 17:28:01 UTC (rev 10858)
@@ -3,7 +3,11 @@
 <?php if (!$WikiTheme->DUMP_MODE) { ?>
 <?php echo empty($WARNINGS) ? '' : $WARNINGS ?>
 <?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?>
-<?php if (defined('DEBUG') and DEBUG & 1) { ?><?php echo Template('debug') ?><?php } ?>
+<?php
+if (DEBUG) {
+    echo Template('debug');
+}
+?>
 <?php } ?>
 </footer>
 <script type="text/javascript" src="<?php echo DATA_PATH ?>/themes/default/highlight.js/highlight.pack.js"></script>

Modified: trunk/themes/fusionforge/templates/bottom.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/bottom.tmpl	2022-01-06 16:38:54 UTC (rev 10857)
+++ trunk/themes/fusionforge/templates/bottom.tmpl	2022-01-06 17:28:01 UTC (rev 10858)
@@ -1,8 +1,10 @@
 <?php if (!$WikiTheme->DUMP_MODE) { ?>
-<?php if (defined('DEBUG') and DEBUG) { ?>
+<?php if (DEBUG) { ?>
 <?php echo empty($WARNINGS) ? '' : $WARNINGS ?>
 <?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?>
-<?php echo Template('debug') ?>
+<?php
+    echo Template('debug');
+?>
 <?php } ?>
 <?php } ?>
 <script type="text/javascript" src="/wiki/themes/default/highlight.js/highlight.pack.js"></script>

Modified: trunk/themes/smaller/templates/info.tmpl
===================================================================
--- trunk/themes/smaller/templates/info.tmpl	2022-01-06 16:38:54 UTC (rev 10857)
+++ trunk/themes/smaller/templates/info.tmpl	2022-01-06 17:28:01 UTC (rev 10858)
@@ -8,7 +8,7 @@
     <?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'minor'),_("Diff previous Revision"),$page->getName()) ?>
     <?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'author'),_("Diff previous Author"),$page->getName()) ?>
     <?php echo $SEP?><?php echo Button(__("PageDump"), _("Page Dump")) ?>
-  <?php if ((defined('DEBUG') && DEBUG) || $user->isAdmin()) { ?>
+<?php if (DEBUG || $user->isAdmin()) { ?>
     <?php // Buttons really only for debugging ?>
     <?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("Debug Backend Info")) ?>
 <?php
@@ -18,5 +18,5 @@
 ?>
     <?php echo $SEP?><?php echo $PurgeCache ?>
     <?php // End debugging buttons ?>
-  <?php } ?>
+<?php } ?>
 </div>

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