1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-10 08:52:39 +01:00

Remove phame.skins config option

Summary: Removes an unneeded config. Ref T9897

Test Plan: New Blog, View Blog live.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Maniphest Tasks: T9897

Differential Revision: https://secure.phabricator.com/D14714
This commit is contained in:
Chad Little 2015-12-08 15:04:02 -08:00
parent dafdd39ba9
commit d3452967e0
3 changed files with 6 additions and 43 deletions

View file

@ -2675,7 +2675,6 @@ phutil_register_library_map(array(
'PhabricatorPhabricatorAuthProvider' => 'applications/auth/provider/PhabricatorPhabricatorAuthProvider.php', 'PhabricatorPhabricatorAuthProvider' => 'applications/auth/provider/PhabricatorPhabricatorAuthProvider.php',
'PhabricatorPhameApplication' => 'applications/phame/application/PhabricatorPhameApplication.php', 'PhabricatorPhameApplication' => 'applications/phame/application/PhabricatorPhameApplication.php',
'PhabricatorPhameBlogPHIDType' => 'applications/phame/phid/PhabricatorPhameBlogPHIDType.php', 'PhabricatorPhameBlogPHIDType' => 'applications/phame/phid/PhabricatorPhameBlogPHIDType.php',
'PhabricatorPhameConfigOptions' => 'applications/phame/config/PhabricatorPhameConfigOptions.php',
'PhabricatorPhamePostPHIDType' => 'applications/phame/phid/PhabricatorPhamePostPHIDType.php', 'PhabricatorPhamePostPHIDType' => 'applications/phame/phid/PhabricatorPhamePostPHIDType.php',
'PhabricatorPhluxApplication' => 'applications/phlux/application/PhabricatorPhluxApplication.php', 'PhabricatorPhluxApplication' => 'applications/phlux/application/PhabricatorPhluxApplication.php',
'PhabricatorPholioApplication' => 'applications/pholio/application/PhabricatorPholioApplication.php', 'PhabricatorPholioApplication' => 'applications/pholio/application/PhabricatorPholioApplication.php',
@ -6885,7 +6884,6 @@ phutil_register_library_map(array(
'PhabricatorPhabricatorAuthProvider' => 'PhabricatorOAuth2AuthProvider', 'PhabricatorPhabricatorAuthProvider' => 'PhabricatorOAuth2AuthProvider',
'PhabricatorPhameApplication' => 'PhabricatorApplication', 'PhabricatorPhameApplication' => 'PhabricatorApplication',
'PhabricatorPhameBlogPHIDType' => 'PhabricatorPHIDType', 'PhabricatorPhameBlogPHIDType' => 'PhabricatorPHIDType',
'PhabricatorPhameConfigOptions' => 'PhabricatorApplicationConfigOptions',
'PhabricatorPhamePostPHIDType' => 'PhabricatorPHIDType', 'PhabricatorPhamePostPHIDType' => 'PhabricatorPHIDType',
'PhabricatorPhluxApplication' => 'PhabricatorApplication', 'PhabricatorPhluxApplication' => 'PhabricatorApplication',
'PhabricatorPholioApplication' => 'PhabricatorApplication', 'PhabricatorPholioApplication' => 'PhabricatorApplication',

View file

@ -1,36 +0,0 @@
<?php
final class PhabricatorPhameConfigOptions
extends PhabricatorApplicationConfigOptions {
public function getName() {
return pht('Phame');
}
public function getDescription() {
return pht('Configure Phame blogs.');
}
public function getFontIcon() {
return 'fa-star';
}
public function getGroup() {
return 'apps';
}
public function getOptions() {
return array(
$this->newOption(
'phame.skins',
'list<string>',
array(
'externals/skins/',
))
->setLocked(true)
->setDescription(
pht('List of directories where Phame will look for skins.')),
);
}
}

View file

@ -2,8 +2,9 @@
final class PhameSkinSpecification extends Phobject { final class PhameSkinSpecification extends Phobject {
const TYPE_ADVANCED = 'advanced'; const TYPE_ADVANCED = 'advanced';
const TYPE_BASIC = 'basic'; const TYPE_BASIC = 'basic';
const SKIN_PATH = 'externals/skins/';
private $type; private $type;
private $rootDirectory; private $rootDirectory;
@ -16,7 +17,7 @@ final class PhameSkinSpecification extends Phobject {
static $specs; static $specs;
if ($specs === null) { if ($specs === null) {
$paths = PhabricatorEnv::getEnvConfig('phame.skins'); $paths = array(self::SKIN_PATH);
$base = dirname(phutil_get_library_root('phabricator')); $base = dirname(phutil_get_library_root('phabricator'));
$specs = array(); $specs = array();
@ -48,7 +49,7 @@ final class PhameSkinSpecification extends Phobject {
$name, $name,
$this_dir, $this_dir,
$that_dir, $that_dir,
'phame.skins')); self::SKIN_PATH));
} }
$specs[$name] = $spec; $specs[$name] = $spec;
@ -70,7 +71,7 @@ final class PhameSkinSpecification extends Phobject {
$name)); $name));
} }
$paths = PhabricatorEnv::getEnvConfig('phame.skins'); $paths = array(self::SKIN_PATH);
$base = dirname(phutil_get_library_root('phabricator')); $base = dirname(phutil_get_library_root('phabricator'));
foreach ($paths as $path) { foreach ($paths as $path) {
$path = Filesystem::resolvePath($path, $base); $path = Filesystem::resolvePath($path, $base);