More style fixes
This commit is contained in:
parent
68562dafb4
commit
df7d6cb26c
|
@ -619,7 +619,7 @@ abstract class Access {
|
|||
//a) paged search insuccessful, though attempted
|
||||
//b) no paged search, but limit set
|
||||
if((!$this->pagedSearchedSuccessful
|
||||
&& $pagedSearchOK)
|
||||
&& $pagedSearchOK)
|
||||
|| (
|
||||
!$pagedSearchOK
|
||||
&& !is_null($limit)
|
||||
|
|
|
@ -1 +1 @@
|
|||
<?php echo $l->t( 'You are logged out.' ); ?>
|
||||
<?php echo $l->t( 'You are logged out.' );
|
||||
|
|
10
lib/l10n.php
10
lib/l10n.php
|
@ -115,10 +115,12 @@ class OC_L10N{
|
|||
$i18ndir = self::findI18nDir($app);
|
||||
// Localization is in /l10n, Texts are in $i18ndir
|
||||
// (Just no need to define date/time format etc. twice)
|
||||
if((OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC_App::getAppPath($app).'/l10n/') ||
|
||||
OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/core/l10n/') ||
|
||||
OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/lib/l10n/') ||
|
||||
OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/settings')) && file_exists($i18ndir.$lang.'.php')) {
|
||||
if((OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC_App::getAppPath($app).'/l10n/')
|
||||
|| OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/core/l10n/')
|
||||
|| OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/lib/l10n/')
|
||||
|| OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/settings')
|
||||
)
|
||||
&& file_exists($i18ndir.$lang.'.php')) {
|
||||
// Include the file, save the data from $CONFIG
|
||||
include strip_tags($i18ndir).strip_tags($lang).'.php';
|
||||
if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)) {
|
||||
|
|
|
@ -331,8 +331,7 @@ class OC_Util {
|
|||
$parameters[$value] = true;
|
||||
}
|
||||
if (!empty($_POST['user'])) {
|
||||
$parameters["username"] =
|
||||
OC_Util::sanitizeHTML($_POST['user']).'"';
|
||||
$parameters["username"] = OC_Util::sanitizeHTML($_POST['user']).'"';
|
||||
$parameters['user_autofocus'] = false;
|
||||
} else {
|
||||
$parameters["username"] = '';
|
||||
|
|
|
@ -6,4 +6,4 @@
|
|||
|
||||
<?php foreach($_['forms'] as $form) {
|
||||
echo $form;
|
||||
};?>
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue