From fd1dc2fb15c4e5e8d86c7cf39391d22ac1cd582d Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Wed, 10 Apr 2013 20:07:03 +0200 Subject: [PATCH] Resolved a few TODOs --- .../files/lib/acp/form/UsersMassProcessingForm.class.php | 5 ++++- wcfsetup/install/files/lib/data/user/UserAction.class.php | 4 ++-- .../install/files/lib/data/user/option/UserOption.class.php | 3 +-- .../install/files/lib/system/request/RouteHandler.class.php | 2 -- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/wcfsetup/install/files/lib/acp/form/UsersMassProcessingForm.class.php b/wcfsetup/install/files/lib/acp/form/UsersMassProcessingForm.class.php index 8e9cbb998e..5ee0ac4873 100644 --- a/wcfsetup/install/files/lib/acp/form/UsersMassProcessingForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UsersMassProcessingForm.class.php @@ -301,7 +301,10 @@ class UsersMassProcessingForm extends UserOptionListForm { } /** - * @todo add documentation + * Fetches a list of users. + * + * @param mixed $loopFunction + * @return array */ protected function fetchUsers($loopFunction = null) { // select users diff --git a/wcfsetup/install/files/lib/data/user/UserAction.class.php b/wcfsetup/install/files/lib/data/user/UserAction.class.php index 84161e9059..2636c7e899 100644 --- a/wcfsetup/install/files/lib/data/user/UserAction.class.php +++ b/wcfsetup/install/files/lib/data/user/UserAction.class.php @@ -15,7 +15,7 @@ use wcf\util\StringUtil; * Executes user-related actions. * * @author Alexander Ebert - * @copyright 2001-2012 WoltLab GmbH + * @copyright 2001-2013 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf * @subpackage data.user @@ -245,7 +245,7 @@ class UserAction extends AbstractDatabaseObjectAction implements IClipboardActio $sql = "SELECT userID, username FROM wcf".WCF_N."_user ".$conditionBuilder; - $statement = WCF::getDB()->prepareStatement($sql, 10); /* TODO: add limit parameter */ + $statement = WCF::getDB()->prepareStatement($sql, 10); $statement->execute($conditionBuilder->getParameters()); while ($row = $statement->fetchArray()) { $list[] = array( diff --git a/wcfsetup/install/files/lib/data/user/option/UserOption.class.php b/wcfsetup/install/files/lib/data/user/option/UserOption.class.php index 421f7ab0eb..e1d9b875e1 100644 --- a/wcfsetup/install/files/lib/data/user/option/UserOption.class.php +++ b/wcfsetup/install/files/lib/data/user/option/UserOption.class.php @@ -151,8 +151,7 @@ class UserOption extends Option { } // check owner state - // TODO: Shouldn't this be: EDITABILITY_OWNER? - if ($this->editable & self::VISIBILITY_OWNER) { + if ($this->editable & self::EDITABILITY_OWNER) { if ($this->user === null || $this->user->userID == WCF::getUser()->userID) { return true; } diff --git a/wcfsetup/install/files/lib/system/request/RouteHandler.class.php b/wcfsetup/install/files/lib/system/request/RouteHandler.class.php index c19297727d..0e10264333 100644 --- a/wcfsetup/install/files/lib/system/request/RouteHandler.class.php +++ b/wcfsetup/install/files/lib/system/request/RouteHandler.class.php @@ -73,8 +73,6 @@ class RouteHandler extends SingletonFactory { /** * Adds default routes. - * - * @todo add support for custom default controllers (see https://github.com/WoltLab/WCF/issues/1000) */ protected function addDefaultRoutes() { $acpRoute = new Route('ACP_default', true); -- 2.20.1