|
|
|
@ -63,17 +63,17 @@ class OC_App{ |
|
|
|
|
|
|
|
|
|
if (!defined('DEBUG') || !DEBUG) { |
|
|
|
|
if (is_null($types) |
|
|
|
|
&& empty(OC_Util::$core_scripts) |
|
|
|
|
&& empty(OC_Util::$core_styles)) { |
|
|
|
|
&& empty(OC_Util::$core_scripts) |
|
|
|
|
&& empty(OC_Util::$core_styles)) { |
|
|
|
|
OC_Util::$core_scripts = OC_Util::$scripts; |
|
|
|
|
OC_Util::$scripts = array(); |
|
|
|
|
OC_Util::$core_styles = OC_Util::$styles; |
|
|
|
|
OC_Util::$styles = array(); |
|
|
|
|
} |
|
|
|
|
OC_Util::$scripts = array(); |
|
|
|
|
OC_Util::$core_styles = OC_Util::$styles; |
|
|
|
|
OC_Util::$styles = array(); |
|
|
|
|
} |
|
|
|
|
// return |
|
|
|
|
return true; |
|
|
|
|
} |
|
|
|
|
// return |
|
|
|
|
return true; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* load a single app |
|
|
|
@ -299,7 +299,7 @@ class OC_App{ |
|
|
|
|
if(OC_Config::getValue('knowledgebaseenabled', true)==true) { |
|
|
|
|
$settings = array( |
|
|
|
|
array( "id" => "help", "order" => 1000, "href" => OC_Helper::linkToRoute( "settings_help" ), "name" => $l->t("Help"), "icon" => OC_Helper::imagePath( "settings", "help.svg" )) |
|
|
|
|
); |
|
|
|
|
); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// if the user is logged-in |
|
|
|
@ -519,16 +519,16 @@ class OC_App{ |
|
|
|
|
$forms=array(); |
|
|
|
|
switch($type) { |
|
|
|
|
case 'settings': |
|
|
|
|
$source=self::$settingsForms; |
|
|
|
|
break; |
|
|
|
|
$source=self::$settingsForms; |
|
|
|
|
break; |
|
|
|
|
case 'admin': |
|
|
|
|
$source=self::$adminForms; |
|
|
|
|
break; |
|
|
|
|
$source=self::$adminForms; |
|
|
|
|
break; |
|
|
|
|
case 'personal': |
|
|
|
|
$source=self::$personalForms; |
|
|
|
|
break; |
|
|
|
|
$source=self::$personalForms; |
|
|
|
|
break; |
|
|
|
|
default: |
|
|
|
|
return array(); |
|
|
|
|
return array(); |
|
|
|
|
} |
|
|
|
|
foreach($source as $form) { |
|
|
|
|
$forms[]=include $form; |
|
|
|
|