From: <var...@us...> - 2022-04-19 14:28:03
|
Revision: 11021 http://sourceforge.net/p/phpwiki/code/11021 Author: vargenau Date: 2022-04-19 14:28:00 +0000 (Tue, 19 Apr 2022) Log Message: ----------- Whitespace Modified Paths: -------------- trunk/themes/Crao/templates/body.tmpl trunk/themes/MonoBook/templates/body.tmpl trunk/themes/Portland/templates/body.tmpl trunk/themes/Sidebar/templates/body.tmpl trunk/themes/Wordpress/templates/body.tmpl trunk/themes/blog/templates/body.tmpl trunk/themes/default/templates/body.tmpl trunk/themes/fusionforge/templates/body.tmpl trunk/themes/wikilens/templates/body.tmpl Modified: trunk/themes/Crao/templates/body.tmpl =================================================================== --- trunk/themes/Crao/templates/body.tmpl 2022-04-19 14:23:13 UTC (rev 11020) +++ trunk/themes/Crao/templates/body.tmpl 2022-04-19 14:28:00 UTC (rev 11021) @@ -15,16 +15,16 @@ <?php $action = $request->getArg('action'); if ($page->exists()) { - if (empty($revision)) { - $revision = $page->getCurrentRevision(false); - } - if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?> + if (empty($revision)) { + $revision = $page->getCurrentRevision(false); + } + if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?> <p class="warning_msg"><strong><?php echo _("Note:") ?></strong> <?php echo _("This page has been locked and cannot be edited.") ?> </p> <?php } - if (($action != 'edit') && ($action != 'revert') + if (($action != 'edit') && ($action != 'revert') && $revision and !$revision->isCurrent()) { if ($revision->hasDefaultContents()) { ?> <p class="error"> Modified: trunk/themes/MonoBook/templates/body.tmpl =================================================================== --- trunk/themes/MonoBook/templates/body.tmpl 2022-04-19 14:23:13 UTC (rev 11020) +++ trunk/themes/MonoBook/templates/body.tmpl 2022-04-19 14:28:00 UTC (rev 11021) @@ -9,16 +9,16 @@ <?php $action = $request->getArg('action'); if ($page->exists()) { - if (empty($revision)) { - $revision = $page->getCurrentRevision(false); - } - if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?> + if (empty($revision)) { + $revision = $page->getCurrentRevision(false); + } + if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?> <p class="warning_msg"><strong><?php echo _("Note:") ?></strong> <?php echo _("This page has been locked and cannot be edited.") ?> </p> <?php } - if (($action != 'edit') && ($action != 'revert') + if (($action != 'edit') && ($action != 'revert') && $revision and !$revision->isCurrent()) { if ($revision->hasDefaultContents()) { ?> <p class="error"> Modified: trunk/themes/Portland/templates/body.tmpl =================================================================== --- trunk/themes/Portland/templates/body.tmpl 2022-04-19 14:23:13 UTC (rev 11020) +++ trunk/themes/Portland/templates/body.tmpl 2022-04-19 14:28:00 UTC (rev 11021) @@ -10,16 +10,16 @@ <?php $action = $request->getArg('action'); if ($page->exists()) { - if (empty($revision)) { - $revision = $page->getCurrentRevision(false); - } - if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?> + if (empty($revision)) { + $revision = $page->getCurrentRevision(false); + } + if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?> <p class="warning_msg"><strong><?php echo _("Note:") ?></strong> <?php echo _("This page has been locked and cannot be edited.") ?> </p> <?php } - if (($action != 'edit') && ($action != 'revert') + if (($action != 'edit') && ($action != 'revert') && $revision and !$revision->isCurrent()) { if ($revision->hasDefaultContents()) { ?> <p class="error"> Modified: trunk/themes/Sidebar/templates/body.tmpl =================================================================== --- trunk/themes/Sidebar/templates/body.tmpl 2022-04-19 14:23:13 UTC (rev 11020) +++ trunk/themes/Sidebar/templates/body.tmpl 2022-04-19 14:28:00 UTC (rev 11021) @@ -7,16 +7,16 @@ <?php $action = $request->getArg('action'); if ($page->exists()) { - if (empty($revision)) { - $revision = $page->getCurrentRevision(false); - } - if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?> + if (empty($revision)) { + $revision = $page->getCurrentRevision(false); + } + if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?> <p class="warning_msg"><strong><?php echo _("Note:") ?></strong> <?php echo _("This page has been locked and cannot be edited.") ?> </p> <?php } - if (($action != 'edit') && ($action != 'revert') + if (($action != 'edit') && ($action != 'revert') && $revision and !$revision->isCurrent()) { if ($revision->hasDefaultContents()) { ?> <p class="error"> Modified: trunk/themes/Wordpress/templates/body.tmpl =================================================================== --- trunk/themes/Wordpress/templates/body.tmpl 2022-04-19 14:23:13 UTC (rev 11020) +++ trunk/themes/Wordpress/templates/body.tmpl 2022-04-19 14:28:00 UTC (rev 11021) @@ -6,16 +6,16 @@ <?php $action = $request->getArg('action'); if ($page->exists()) { - if (empty($revision)) { - $revision = $page->getCurrentRevision(false); - } - if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?> + if (empty($revision)) { + $revision = $page->getCurrentRevision(false); + } + if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?> <p class="warning_msg"><strong><?php echo _("Note:") ?></strong> <?php echo _("This page has been locked and cannot be edited.") ?> </p> <?php } - if (($action != 'edit') && ($action != 'revert') + if (($action != 'edit') && ($action != 'revert') && $revision and !$revision->isCurrent()) { if ($revision->hasDefaultContents()) { ?> <p class="error"> Modified: trunk/themes/blog/templates/body.tmpl =================================================================== --- trunk/themes/blog/templates/body.tmpl 2022-04-19 14:23:13 UTC (rev 11020) +++ trunk/themes/blog/templates/body.tmpl 2022-04-19 14:28:00 UTC (rev 11021) @@ -7,16 +7,16 @@ <?php $action = $request->getArg('action'); if ($page->exists()) { - if (empty($revision)) { - $revision = $page->getCurrentRevision(false); - } - if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?> + if (empty($revision)) { + $revision = $page->getCurrentRevision(false); + } + if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?> <p class="warning_msg"><strong><?php echo _("Note:") ?></strong> <?php echo _("This page has been locked and cannot be edited.") ?> </p> <?php } - if (($action != 'edit') && ($action != 'revert') + if (($action != 'edit') && ($action != 'revert') && $revision and !$revision->isCurrent()) { if ($revision->hasDefaultContents()) { ?> <p class="error"> Modified: trunk/themes/default/templates/body.tmpl =================================================================== --- trunk/themes/default/templates/body.tmpl 2022-04-19 14:23:13 UTC (rev 11020) +++ trunk/themes/default/templates/body.tmpl 2022-04-19 14:28:00 UTC (rev 11021) @@ -8,16 +8,16 @@ <?php $action = $request->getArg('action'); if ($page->exists()) { - if (empty($revision)) { - $revision = $page->getCurrentRevision(false); - } - if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?> + if (empty($revision)) { + $revision = $page->getCurrentRevision(false); + } + if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?> <p class="warning_msg"><strong><?php echo _("Note:") ?></strong> <?php echo _("This page has been locked and cannot be edited.") ?> </p> <?php } - if (($action != 'edit') && ($action != 'revert') + if (($action != 'edit') && ($action != 'revert') && $revision and !$revision->isCurrent()) { if ($revision->hasDefaultContents()) { ?> <p class="error"> Modified: trunk/themes/fusionforge/templates/body.tmpl =================================================================== --- trunk/themes/fusionforge/templates/body.tmpl 2022-04-19 14:23:13 UTC (rev 11020) +++ trunk/themes/fusionforge/templates/body.tmpl 2022-04-19 14:28:00 UTC (rev 11021) @@ -9,10 +9,11 @@ <?php } ?> <div id="content"> <?php -if (ENABLE_RATEIT && $page->exists()) - $rating = 1; -else +if (ENABLE_RATEIT && $page->exists()) { + $rating = 1; + } else { $rating = 0; +} ?> <a id="contentTop"></a> <h1> Modified: trunk/themes/wikilens/templates/body.tmpl =================================================================== --- trunk/themes/wikilens/templates/body.tmpl 2022-04-19 14:23:13 UTC (rev 11020) +++ trunk/themes/wikilens/templates/body.tmpl 2022-04-19 14:28:00 UTC (rev 11021) @@ -23,24 +23,24 @@ <main role="main"> <h1><?php echo $HEADER ?> <?php if (!empty($user) && $user->isSignedIn()) { - $loader = new WikiPluginLoader(); - printXML(HTML::raw(" ")); - $dbi = $request->getDbh(); // Needed in PHP 8 - printXML($loader->expandPI("<"."?plugin RateIt ?".">", $request, $dbi->_markup)); - } ?> </h1> + $loader = new WikiPluginLoader(); + printXML(HTML::raw(" ")); + $dbi = $request->getDbh(); // Needed in PHP 8 + printXML($loader->expandPI("<"."?plugin RateIt ?".">", $request, $dbi->_markup)); +} ?> </h1> <?php $action = $request->getArg('action'); if ($page->exists()) { - if (empty($revision)) { - $revision = $page->getCurrentRevision(false); - } - if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?> + if (empty($revision)) { + $revision = $page->getCurrentRevision(false); + } + if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?> <p class="warning_msg"><strong><?php echo _("Note:") ?></strong> <?php echo _("This page has been locked and cannot be edited.") ?> </p> <?php } - if (($action != 'edit') && ($action != 'revert') + if (($action != 'edit') && ($action != 'revert') && $revision and !$revision->isCurrent()) { if ($revision->hasDefaultContents()) { ?> <p class="error"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |