Merge branch 'master' into phutil_tag

(Final sync.)
2013-02-05 10:23:16 -08:00
parent 94f6b6ca4e 742ee44960
commit 8f1311bbc1
41 changed files with 589 additions and 201 deletions
--- a/src/applications/diffusion/controller/DiffusionBrowseFileController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseFileController.php
@@ -251,10 +251,7 @@ final class DiffusionBrowseFileController extends DiffusionController {

        $lang = last(explode('.', $drequest->getPath()));

-        $prefs = $this->getRequest()->getUser()->loadPreferences();
-        $pref_symbols = $prefs->getPreference(
-          PhabricatorUserPreferences::PREFERENCE_DIFFUSION_SYMBOLS);
-        if (isset($langs[$lang]) && $pref_symbols != 'disabled') {
+        if (isset($langs[$lang])) {
          Javelin::initBehavior(
            'repository-crossreference',
            array(