Page MenuHomePhabricator
Files F15461194

D14714.id35585.diff
No OneTemporary
Actions

D14714.id35585.diff
View Options

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2675,7 +2675,6 @@
'PhabricatorPhabricatorAuthProvider' => 'applications/auth/provider/PhabricatorPhabricatorAuthProvider.php',
'PhabricatorPhameApplication' => 'applications/phame/application/PhabricatorPhameApplication.php',
'PhabricatorPhameBlogPHIDType' => 'applications/phame/phid/PhabricatorPhameBlogPHIDType.php',
- 'PhabricatorPhameConfigOptions' => 'applications/phame/config/PhabricatorPhameConfigOptions.php',
'PhabricatorPhamePostPHIDType' => 'applications/phame/phid/PhabricatorPhamePostPHIDType.php',
'PhabricatorPhluxApplication' => 'applications/phlux/application/PhabricatorPhluxApplication.php',
'PhabricatorPholioApplication' => 'applications/pholio/application/PhabricatorPholioApplication.php',
@@ -6885,7 +6884,6 @@
'PhabricatorPhabricatorAuthProvider' => 'PhabricatorOAuth2AuthProvider',
'PhabricatorPhameApplication' => 'PhabricatorApplication',
'PhabricatorPhameBlogPHIDType' => 'PhabricatorPHIDType',
- 'PhabricatorPhameConfigOptions' => 'PhabricatorApplicationConfigOptions',
'PhabricatorPhamePostPHIDType' => 'PhabricatorPHIDType',
'PhabricatorPhluxApplication' => 'PhabricatorApplication',
'PhabricatorPholioApplication' => 'PhabricatorApplication',
diff --git a/src/applications/phame/config/PhabricatorPhameConfigOptions.php b/src/applications/phame/config/PhabricatorPhameConfigOptions.php
deleted file mode 100644
--- a/src/applications/phame/config/PhabricatorPhameConfigOptions.php
+++ /dev/null
@@ -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.')),
- );
- }
-
-}
diff --git a/src/applications/phame/skins/PhameSkinSpecification.php b/src/applications/phame/skins/PhameSkinSpecification.php
--- a/src/applications/phame/skins/PhameSkinSpecification.php
+++ b/src/applications/phame/skins/PhameSkinSpecification.php
@@ -2,8 +2,9 @@
final class PhameSkinSpecification extends Phobject {
- const TYPE_ADVANCED = 'advanced';
- const TYPE_BASIC = 'basic';
+ const TYPE_ADVANCED = 'advanced';
+ const TYPE_BASIC = 'basic';
+ const SKIN_PATH = 'externals/skins/';
private $type;
private $rootDirectory;
@@ -16,7 +17,7 @@
static $specs;
if ($specs === null) {
- $paths = PhabricatorEnv::getEnvConfig('phame.skins');
+ $paths = array(self::SKIN_PATH);
$base = dirname(phutil_get_library_root('phabricator'));
$specs = array();
@@ -48,7 +49,7 @@
$name,
$this_dir,
$that_dir,
- 'phame.skins'));
+ self::SKIN_PATH));
}
$specs[$name] = $spec;
@@ -70,7 +71,7 @@
$name));
}
- $paths = PhabricatorEnv::getEnvConfig('phame.skins');
+ $paths = array(self::SKIN_PATH);
$base = dirname(phutil_get_library_root('phabricator'));
foreach ($paths as $path) {
$path = Filesystem::resolvePath($path, $base);

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 2, 6:06 AM (3 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7311608
Default Alt Text
D14714.id35585.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility