Ljonka has uploaded a new change for review. https://gerrit.wikimedia.org/r/234516
Change subject: Review: remove missplaced return ...................................................................... Review: remove missplaced return Change-Id: I6cea31da8dca52350b5ee215c21e85ba4fb39698 --- M Review/Review.class.php 1 file changed, 15 insertions(+), 15 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions refs/changes/16/234516/1 diff --git a/Review/Review.class.php b/Review/Review.class.php index f066d0a..34af9f5 100644 --- a/Review/Review.class.php +++ b/Review/Review.class.php @@ -22,14 +22,14 @@ * This file is part of BlueSpice for MediaWiki * For further information visit http://www.blue-spice.org * - * @author Markus Glaser <[email protected]> - * @author Robert Vogel <[email protected]> - * @author Patric Wirth <[email protected]> - * @version 2.23.1 - * @package BlueSpice_Extensions + * @author Markus Glaser <[email protected]> + * @author Robert Vogel <[email protected]> + * @author Patric Wirth <[email protected]> + * @version 2.23.1 + * @package BlueSpice_Extensions * @subpackage Review * @copyright Copyright (C) 2011 Hallo Welt! - Medienwerkstatt GmbH, All rights reserved. - * @license http://www.gnu.org/copyleft/gpl.html GNU Public License v2 or later + * @license http://www.gnu.org/copyleft/gpl.html GNU Public License v2 or later * @filesource */ @@ -394,21 +394,21 @@ $tbl_page = $dbr->tableName('page'); $tbl_user = $dbr->tableName('user'); - $sql = 'SELECT r.rev_id, r.rev_pid, p.page_title, p.page_namespace, u.user_name, u.user_real_name, u.user_id, r.rev_editable, r.rev_sequential, r.rev_abortable, rs.revs_status, u2.user_name AS owner_name, u2.user_real_name AS owner_real_name, '; + $sql = 'SELECT r.rev_id, r.rev_pid, p.page_title, p.page_namespace, u.user_name, u.user_real_name, u.user_id, r.rev_editable, r.rev_sequential, r.rev_abortable, rs.revs_status, u2.user_name AS owner_name, u2.user_real_name AS owner_real_name, '; switch ($wgDBtype) { case 'postgres' : { - $sql.= " EXTRACT(EPOCH FROM TO_TIMESTAMP(r.rev_enddate, 'YYYYMMDDHH24MISS')) AS endtimestamp, TO_CHAR(TO_DATE(r.rev_startdate, 'YYYYMMDDHH24MISS'), 'DD.MM.YYYY') AS startdate, "; - $sql.= " TO_CHAR(TO_DATE(r.rev_enddate, 'YYYYMMDDHH24MISS'), 'DD.MM.YYYY') AS enddate, TO_CHAR(rs.revs_timestamp::timestamp, 'DD.MM') AS stepdate "; + $sql.= " EXTRACT(EPOCH FROM TO_TIMESTAMP(r.rev_enddate, 'YYYYMMDDHH24MISS')) AS endtimestamp, TO_CHAR(TO_DATE(r.rev_startdate, 'YYYYMMDDHH24MISS'), 'DD.MM.YYYY') AS startdate, "; + $sql.= " TO_CHAR(TO_DATE(r.rev_enddate, 'YYYYMMDDHH24MISS'), 'DD.MM.YYYY') AS enddate, TO_CHAR(rs.revs_timestamp::timestamp, 'DD.MM') AS stepdate "; break; } case 'oracle' : { - $sql.= ' (ROUND(TO_DATE(r.rev_enddate, \'YYYYMMDDHH24MISS\') - TO_DATE(\'19700101\', \'YYYYMMDDHH24MISS\')) * 86400) endtimestamp, TO_CHAR(TO_DATE(r.rev_startdate, \'YYYYMMDDHH24MISS\'), \'DD.MM.YYYY\') startdate, '; - $sql.= ' TO_CHAR(TO_DATE(r.rev_enddate, \'YYYYMMDDHH24MISS\'), \'DD.MM.YYYY\') enddate, TO_CHAR(rs.revs_timestamp, \'DD.MM\') stepdate '; + $sql.= ' (ROUND(TO_DATE(r.rev_enddate, \'YYYYMMDDHH24MISS\') - TO_DATE(\'19700101\', \'YYYYMMDDHH24MISS\')) * 86400) endtimestamp, TO_CHAR(TO_DATE(r.rev_startdate, \'YYYYMMDDHH24MISS\'), \'DD.MM.YYYY\') startdate, '; + $sql.= ' TO_CHAR(TO_DATE(r.rev_enddate, \'YYYYMMDDHH24MISS\'), \'DD.MM.YYYY\') enddate, TO_CHAR(rs.revs_timestamp, \'DD.MM\') stepdate '; break; } default: { - $sql.= ' UNIX_TIMESTAMP(r.rev_enddate) AS endtimestamp, DATE_FORMAT(r.rev_startdate, "%d.%m.%Y") AS startdate, '; - $sql.= ' DATE_FORMAT(r.rev_enddate, "%d.%m.%Y") AS enddate, DATE_FORMAT(rs.revs_timestamp, "%d.%m") AS stepdate '; + $sql.= ' UNIX_TIMESTAMP(r.rev_enddate) AS endtimestamp, DATE_FORMAT(r.rev_startdate, "%d.%m.%Y") AS startdate, '; + $sql.= ' DATE_FORMAT(r.rev_enddate, "%d.%m.%Y") AS enddate, DATE_FORMAT(rs.revs_timestamp, "%d.%m") AS stepdate '; } } $sql.= 'FROM ' . $tbl_rev . ' AS r, ' . $tbl_step . ' AS rs, ' . $tbl_page . ' AS p, ' . $tbl_user . ' AS u, ' . $tbl_user . ' AS u2 '; @@ -1065,7 +1065,7 @@ $tbl_step = $dbw->tableName('bs_review_steps'); $conds = array(); - $conds[] = $tbl_step . '.revs_review_id = ' . $tbl_rev . '.rev_id'; // join tables + $conds[] = $tbl_step . '.revs_review_id = ' . $tbl_rev . '.rev_id'; // join tables $conds[] = $tbl_rev . '.rev_pid=' . $iArticleId; // reviews only for current article $conds[] = $tbl_step . '.revs_status=-1'; // prevent user from confirming twice $conds[] = $tbl_step . ".revs_user_id='{$oUser->getId()}'"; // make sure we select a dataset for the current user @@ -1354,7 +1354,7 @@ } //Send mail to next user in queue - return BsMailer::getInstance( 'MW' )->send($oReviewer, $sSubject, $sMsg); + BsMailer::getInstance( 'MW' )->send($oReviewer, $sSubject, $sMsg); } } -- To view, visit https://gerrit.wikimedia.org/r/234516 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6cea31da8dca52350b5ee215c21e85ba4fb39698 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: REL1_23 Gerrit-Owner: Ljonka <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
