upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-20 00:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 38

Merge pull request #18202 from owncloud/revert-route-breaking-changes

Browse source 
Revert route breaking changes
This commit is contained in:
Robin McCorkell 2015-08-11 15:28:06 +01:00
commit cd5342d0ff
4 changed files with 1 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/private/app.php
View file

@ -73,16 +73,6 @@ class OC_App {
return str_replace(array('\0', '/', '\\', '..'), '', $app);
}
/**
* Check if an app is loaded
*
* @param string $app
* @return bool
*/
public static function isAppLoaded($app) {
return in_array($app, self::$loadedApps, true);
}
/**
* loads all apps
*
@ -431,7 +421,6 @@ class OC_App {
*/
public static function getSettingsNavigation() {
$l = \OC::$server->getL10N('lib');
$defaults = new OC_Defaults();
$settings = array();
// by default, settings only contain the help menu
@ -442,7 +431,7 @@ class OC_App {
array(
"id" => "help",
"order" => 1000,
"href" => $defaults->getKnowledgeBaseUrl(),
"href" => OC_Helper::linkToRoute("settings_help"),
"name" => $l->t("Help"),
"icon" => OC_Helper::imagePath("settings", "help.svg")
)

19
lib/private/defaults.php
View file

@ -46,11 +46,9 @@ class OC_Defaults {
private $defaultSlogan;
private $defaultLogoClaim;
private $defaultMailHeaderColor;
private $defaultKnowledgeBaseUrl;
function __construct() {
$this->l = \OC::$server->getL10N('lib');
$urlGenerator = \OC::$server->getURLGenerator();
$version = OC_Util::getVersion();
$this->defaultEntity = 'ownCloud'; /* e.g. company name, used for footers and copyright notices */
@ -66,7 +64,6 @@ class OC_Defaults {
$this->defaultSlogan = $this->l->t('web services under your control');
$this->defaultLogoClaim = '';
$this->defaultMailHeaderColor = '#1d2d44'; /* header color of mail notifications */
$this->defaultKnowledgeBaseUrl = $urlGenerator->linkToRoute('settings_help');
$themePath = OC::$SERVERROOT . '/themes/' . OC_Util::getTheme() . '/defaults.php';
if (file_exists($themePath)) {
@ -82,7 +79,6 @@ class OC_Defaults {
/**
* @param string $method
* @return bool
*/
private function themeExist($method) {
if (isset($this->theme) && method_exists($this->theme, $method)) {
@ -284,19 +280,4 @@ class OC_Defaults {
}
}
/**
* get knowledge base URL, will be used for the "Help"-Link in the top
* right menu
*
* @return string
*/
public function getKnowledgeBaseUrl() {
if ($this->themeExist('getKnowledgeBaseUrl')) {
return $this->theme->getKnowledgeBaseUrl();
} else {
return $this->defaultKnowledgeBaseUrl;
}
}
}

6
lib/private/route/router.php
View file

@ -150,12 +150,6 @@ class Router implements IRouter {
\OC::$server->getEventLogger()->start('loadroutes' . $requestedApp, 'Loading Routes');
foreach ($routingFiles as $app => $file) {
if (!isset($this->loadedApps[$app])) {
if (!\OC_App::isAppLoaded($app)) {
// app MUST be loaded before app routes
// try again next time loadRoutes() is called
$this->loaded = false;
continue;
}
$this->loadedApps[$app] = true;
$this->useCollection($app);
$this->requireRouteFile($file, $app);

6
themes/example/defaults.php
View file

@ -28,7 +28,6 @@ class OC_Theme {
private $themeSyncClientUrl;
private $themeSlogan;
private $themeMailHeaderColor;
private $themeKnowledgeBaseUrl;
/* put your custom text in these variables */
function __construct() {
@ -40,7 +39,6 @@ class OC_Theme {
$this->themeSyncClientUrl = 'https://owncloud.org/install';
$this->themeSlogan = 'Your custom cloud, personalized for you!';
$this->themeMailHeaderColor = '#745bca';
$this->themeKnowledgeBaseUrl = 'https://doc.owncloud.org';
}
/* nothing after this needs to be adjusted */
@ -94,8 +92,4 @@ class OC_Theme {
return $this->themeMailHeaderColor;
}
public function getKnowledgeBaseUrl() {
return $this->themeKnowledgeBaseUrl;
}
}