From: <var...@us...> - 2012-12-11 14:30:49
|
Revision: 8643 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8643&view=rev Author: vargenau Date: 2012-12-11 14:30:38 +0000 (Tue, 11 Dec 2012) Log Message: ----------- Remove unreachable statements Modified Paths: -------------- trunk/lib/WikiUserNew.php trunk/lib/upgrade.php Modified: trunk/lib/WikiUserNew.php =================================================================== --- trunk/lib/WikiUserNew.php 2012-12-11 14:02:25 UTC (rev 8642) +++ trunk/lib/WikiUserNew.php 2012-12-11 14:30:38 UTC (rev 8643) @@ -287,13 +287,7 @@ return $_AnonUser; return $ForbiddenUser; // User must sign in to browse pages. } - return $ForbiddenUser; // User must sign in with a password. } - /* - trigger_error("DEBUG: Note: End of function reached in WikiUser." . " " - . "Unexpectedly, an appropriate user class could not be determined."); - return $ForbiddenUser; // Failsafe. - */ } /** @@ -867,14 +861,6 @@ function checkPass($submitted_password) { return false; - // this might happen on a old-style signin button. - - // By definition, the _AnonUser does not HAVE a password - // (compared to _BogoUser, who has an EMPTY password). - trigger_error("DEBUG: Warning: _AnonUser unexpectedly asked to checkPass()." . " " - . "Check isa(\$user, '_PassUser'), or: isa(\$user, '_AdminUser') etc. first." . " " - . "New subclasses of _WikiUser must override this function."); - return false; } } Modified: trunk/lib/upgrade.php =================================================================== --- trunk/lib/upgrade.php 2012-12-11 14:02:25 UTC (rev 8642) +++ trunk/lib/upgrade.php 2012-12-11 14:30:38 UTC (rev 8643) @@ -919,8 +919,6 @@ function CheckPluginUpdate() { - return; - echo "<h2>", sprintf(_("Check for necessary %s updates"), _("plugin argument")), "</h2>\n"; @@ -1297,16 +1295,19 @@ $upgrade = new Upgrade($request); //if (!$request->getArg('noindex')) // CheckOldIndexUpdate($request); // index.php => config.ini to upgrade from < 1.3.10 - if (!$request->getArg('nodb')) + if (!$request->getArg('nodb')) { $upgrade->CheckDatabaseUpdate($request); // first check cached_html and friends + } if (!$request->getArg('nopgsrc')) { $upgrade->CheckPgsrcUpdate($request); $upgrade->CheckActionPageUpdate($request); } - if (!$request->getArg('noplugin')) - $upgrade->CheckPluginUpdate($request); - if (!$request->getArg('noconfig')) + // if (!$request->getArg('noplugin')) { + // $upgrade->CheckPluginUpdate($request); + // } + if (!$request->getArg('noconfig')) { $upgrade->CheckConfigUpdate($request); + } // This is optional and should be linked. In EndLoadDump or PhpWikiAdministration? //if ($request->getArg('theme')) // $upgrade->CheckThemeUpdate($request); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |