revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2025-01-29 07:58:19 +01:00
Code Issues Releases Wiki Activity

Fix a bug where too many changesets make it to display.

Browse source 
Summary:

Test Plan:

Reviewers:

CC:
This commit is contained in:
epriestley 2011-03-07 22:01:33 -08:00
parent a100d97ed5
commit ad7a389106
4 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
resources/www/index.php
View file

@ -1,5 +1,21 @@
<?php <?php
/*
* Copyright 2011 Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/** /**
* This is the source for <http://www.phabricator.com/>. * This is the source for <http://www.phabricator.com/>.
*/ */
@ -20,11 +36,11 @@ if ($host == 'secure.phabricator.com') {
<body> <body>
<h1>Phabricator</h1> <h1>Phabricator</h1>
<ul> <ul>
<li><a href="https://secure.phabricator.com/">Phabricator Install for Phabricator Development</a></li> <li><a href="https://secure.phabricator.com/">Phabricator Install for Phabricator Development</a></li>
<li><a href="docs/libphutil/">Libphutil Docs</a></li> <li><a href="docs/libphutil/">Libphutil Docs</a></li>
<li><a href="docs/arcanist/">Arcanist Docs</a></li> <li><a href="docs/arcanist/">Arcanist Docs</a></li>
<li><a href="docs/phabricator/">Phabricator Docs</a></li> <li><a href="docs/phabricator/">Phabricator Docs</a></li>
<li><a href="docs/javelin/">Javelin Docs</a></li> <li><a href="docs/javelin/">Javelin Docs</a></li>
</ul> </ul>
</body> </body>
</html> </html>

2
src/applications/base/controller/base/PhabricatorController.php
View file

@ -56,7 +56,7 @@ abstract class PhabricatorController extends AphrontController {
} }
if ($this->shouldRequireLogin() && !$user->getPHID()) { if ($this->shouldRequireLogin() && !$user->getPHID()) {
$login_controller = new PhabricatorLoginController($request); $login_controller = newv('PhabricatorLoginController', array($request));
return $this->delegateToController($login_controller); return $this->delegateToController($login_controller);
} }
} }

3
src/applications/base/controller/base/__init__.php
View file

@ -9,11 +9,12 @@
phutil_require_module('phabricator', 'aphront/console/core'); phutil_require_module('phabricator', 'aphront/console/core');
phutil_require_module('phabricator', 'aphront/controller'); phutil_require_module('phabricator', 'aphront/controller');
phutil_require_module('phabricator', 'aphront/response/webpage'); phutil_require_module('phabricator', 'aphront/response/webpage');
phutil_require_module('phabricator', 'applications/auth/controller/login');
phutil_require_module('phabricator', 'applications/people/storage/user'); phutil_require_module('phabricator', 'applications/people/storage/user');
phutil_require_module('phabricator', 'infrastructure/env'); phutil_require_module('phabricator', 'infrastructure/env');
phutil_require_module('phabricator', 'storage/queryfx'); phutil_require_module('phabricator', 'storage/queryfx');
phutil_require_module('phabricator', 'view/page/standard'); phutil_require_module('phabricator', 'view/page/standard');
phutil_require_module('phutil', 'utils');
phutil_require_source('PhabricatorController.php'); phutil_require_source('PhabricatorController.php');

5
src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php
View file

@ -54,7 +54,8 @@ class DifferentialRevisionViewController extends DifferentialController {
$this->getImplicitComments($revision), $this->getImplicitComments($revision),
$comments); $comments);
$inlines = $this->loadInlineComments($comments, $changesets); $all_changesets = $changesets;
$inlines = $this->loadInlineComments($comments, $all_changesets);
$object_phids = array_merge( $object_phids = array_merge(
$revision->getReviewers(), $revision->getReviewers(),
@ -116,7 +117,7 @@ class DifferentialRevisionViewController extends DifferentialController {
$comment_view->setComments($comments); $comment_view->setComments($comments);
$comment_view->setHandles($handles); $comment_view->setHandles($handles);
$comment_view->setInlineComments($inlines); $comment_view->setInlineComments($inlines);
$comment_view->setChangesets($changesets); $comment_view->setChangesets($all_changesets);
$comment_view->setUser($user); $comment_view->setUser($user);
$diff_history = new DifferentialRevisionUpdateHistoryView(); $diff_history = new DifferentialRevisionUpdateHistoryView();