[phpwiki-checkins] SF.net SVN: phpwiki:[9310] trunk/lib/WikiUser.php

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

Revision: 9310
          http://sourceforge.net/p/phpwiki/code/9310
Author:   vargenau
Date:     2014-11-13 20:10:04 +0000 (Thu, 13 Nov 2014)
Log Message:
-----------
GeneratePage is void

Modified Paths:
--------------
    trunk/lib/WikiUser.php

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2014-11-12 17:14:28 UTC (rev 9309)
+++ trunk/lib/WikiUser.php	2014-11-13 20:10:04 UTC (rev 9310)
@@ -500,8 +500,7 @@
     }
 
     //Fixme: for _HttpAuthPassUser
-    function PrintLoginForm(&$request, $args, $fail_message = false,
-                            $separate_page = false)
+    function PrintLoginForm(&$request, $args, $fail_message = '', $separate_page = false)
     {
         include_once 'lib/Template.php';
         // Call update_locale in case the system's default language is not 'en'.
@@ -524,9 +523,9 @@
         if ($separate_page) {
             $page = $request->getPage($pagename);
             $revision = $page->getCurrentRevision();
-            return GeneratePage($login, _("Sign In"), $revision);
+            GeneratePage($login, _("Sign In"), $revision);
         } else {
-            return $login->printExpansion();
+            $login->printExpansion();
         }
     }
 
@@ -1035,10 +1034,10 @@
 
     function getAuthDbh()
     {
-        global $request; //, $DBParams, $DBAuthParams;
+        global $request;
 
         $dbh = $request->getDbh();
-        // session restauration doesn't re-connect to the database automatically,
+        // session restoration doesn't re-connect to the database automatically,
         // so dirty it here, to force a reconnect.
         if (isset($this->_auth_dbi)) {
             if (($dbh->getParam('dbtype') == 'SQL') and empty($this->_auth_dbi->connection))
@@ -1082,10 +1081,10 @@
     }
 
     // TODO: use it again for the auth and member tables
-    // sprintfstyle vs prepare style: %s or ?
+    // sprintf style vs prepare style: %s or ?
     //   multiple vars should be executed via prepare(?,?)+execute,
     //   single vars with execute(sprintf(quote(var)))
-    // help with position independency
+    // help with position independence
     function prepare($stmt, $variables, $oldstyle = false, $sprintfstyle = true)
     {
         global $request;

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