[Fusionforge-commits] FusionForge branch master updated. 7e1d294460a4b7fbeff0d9607a27bb576a364174

Marc-Etienne VARGENAU vargenau at fusionforge.org
Mon Sep 1 12:18:15 CEST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  7e1d294460a4b7fbeff0d9607a27bb576a364174 (commit)
      from  f9fbeeb2e4c54d3163ce4e5b353ce61c004e308e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7e1d294460a4b7fbeff0d9607a27bb576a364174
Author: Marc-Etienne Vargenau <Marc-Etienne.Vargenau at alcatel-lucent.com>
Date:   Mon Sep 1 12:18:08 2014 +0200

    wiki: cosmetic

diff --git a/src/plugins/wiki/www/lib/main.php b/src/plugins/wiki/www/lib/main.php
index cce4c67..179dfcc 100644
--- a/src/plugins/wiki/www/lib/main.php
+++ b/src/plugins/wiki/www/lib/main.php
@@ -387,7 +387,8 @@ class WikiRequest extends Request
         if (!empty($HTTP_GET_VARS['start_debug'])) // zend ide support
             return WikiURL($pagename, array('action' => $action, 'start_debug' => 1));
         elseif ($action == 'edit')
-            return WikiURL($pagename); else
+            return WikiURL($pagename); 
+        else
             return WikiURL($pagename, array('action' => $action));
     }
 
diff --git a/src/plugins/wiki/www/lib/plugin/RecentChanges.php b/src/plugins/wiki/www/lib/plugin/RecentChanges.php
index 9ee169c..6f1b5ff 100644
--- a/src/plugins/wiki/www/lib/plugin/RecentChanges.php
+++ b/src/plugins/wiki/www/lib/plugin/RecentChanges.php
@@ -1302,7 +1302,9 @@ class WikiPlugin_RecentChanges
 
     function getArgs($argstr, $request = false, $defaults = array())
     {
-        if (!$defaults) $defaults = $this->getDefaultArguments();
+        if (empty($defaults)) {
+            $defaults = $this->getDefaultArguments();
+        }
         $args = WikiPlugin::getArgs($argstr, $request, $defaults);
 
         $action = $request->getArg('action');
diff --git a/src/plugins/wiki/www/lib/plugin/RedirectTo.php b/src/plugins/wiki/www/lib/plugin/RedirectTo.php
index 2fd1b26..22a4b8a 100644
--- a/src/plugins/wiki/www/lib/plugin/RedirectTo.php
+++ b/src/plugins/wiki/www/lib/plugin/RedirectTo.php
@@ -53,7 +53,7 @@ class WikiPlugin_RedirectTo
 
     function run($dbi, $argstr, &$request, $basepage)
     {
-        $args = ($this->getArgs($argstr, $request));
+        $args = $this->getArgs($argstr, $request);
 
         $href = $args['href'];
         $page = $args['page'];

-----------------------------------------------------------------------

Summary of changes:
 src/plugins/wiki/www/lib/main.php                 |    3 ++-
 src/plugins/wiki/www/lib/plugin/RecentChanges.php |    4 +++-
 src/plugins/wiki/www/lib/plugin/RedirectTo.php    |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list