Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Nextcloud
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Nextcloud
Commits
a165710e
Commit
a165710e
authored
9 years ago
by
Phil Davis
Browse files
Options
Downloads
Patches
Plain Diff
Minor text typos
that I noticed while looking at some code.
parent
c5f0ad49
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
autotest.sh
+1
-1
1 addition, 1 deletion
autotest.sh
config/config.sample.php
+1
-1
1 addition, 1 deletion
config/config.sample.php
cron.php
+1
-1
1 addition, 1 deletion
cron.php
lib/base.php
+3
-3
3 additions, 3 deletions
lib/base.php
lib/private/activity/event.php
+1
-1
1 addition, 1 deletion
lib/private/activity/event.php
with
7 additions
and
7 deletions
autotest.sh
+
1
−
1
View file @
a165710e
...
@@ -171,7 +171,7 @@ function execute_tests {
...
@@ -171,7 +171,7 @@ function execute_tests {
else
else
if
[
"MariaDB"
!=
"
$(
mysql
--version
|
grep
-o
MariaDB
)
"
]
;
then
if
[
"MariaDB"
!=
"
$(
mysql
--version
|
grep
-o
MariaDB
)
"
]
;
then
echo
"Your mysql binary is not provided by MariaDB"
echo
"Your mysql binary is not provided by MariaDB"
echo
"To use the docker container set the USEDOCKER enviroment variable"
echo
"To use the docker container set the USEDOCKER enviro
n
ment variable"
exit
-1
exit
-1
fi
fi
mysql
-u
"
$DATABASEUSER
"
-powncloud
-e
"DROP DATABASE IF EXISTS
$DATABASENAME
"
-h
$DATABASEHOST
||
true
mysql
-u
"
$DATABASEUSER
"
-powncloud
-e
"DROP DATABASE IF EXISTS
$DATABASENAME
"
-h
$DATABASEHOST
||
true
...
...
This diff is collapsed.
Click to expand it.
config/config.sample.php
+
1
−
1
View file @
a165710e
...
@@ -452,7 +452,7 @@ $CONFIG = array(
...
@@ -452,7 +452,7 @@ $CONFIG = array(
* expire rules. Please refer to Files_versions online documentation
* expire rules. Please refer to Files_versions online documentation
* for more info.
* for more info.
* ``D, auto`` keep versions at least for D days, apply expire rules to all
* ``D, auto`` keep versions at least for D days, apply expire rules to all
* versions that older than D days
* versions that
are
older than D days
* * ``auto, D`` delete all versions that are older than D days automatically,
* * ``auto, D`` delete all versions that are older than D days automatically,
* delete other versions according to expire rules
* delete other versions according to expire rules
* * ``D1, D2`` keep versions for at least D1 days and delete when exceeds D2 days
* * ``D1, D2`` keep versions for at least D1 days and delete when exceeds D2 days
...
...
This diff is collapsed.
Click to expand it.
cron.php
+
1
−
1
View file @
a165710e
...
@@ -113,7 +113,7 @@ try {
...
@@ -113,7 +113,7 @@ try {
\OCP\BackgroundJob
::
setExecutionType
(
'cron'
);
\OCP\BackgroundJob
::
setExecutionType
(
'cron'
);
}
}
// open the file and try to lock i
f
. If it is not locked, the background
// open the file and try to lock i
t
. If it is not locked, the background
// job can be executed, otherwise another instance is already running
// job can be executed, otherwise another instance is already running
$fp
=
fopen
(
$lockFile
,
'w'
);
$fp
=
fopen
(
$lockFile
,
'w'
);
$isLocked
=
flock
(
$fp
,
LOCK_EX
|
LOCK_NB
,
$wouldBlock
);
$isLocked
=
flock
(
$fp
,
LOCK_EX
|
LOCK_NB
,
$wouldBlock
);
...
...
This diff is collapsed.
Click to expand it.
lib/base.php
+
3
−
3
View file @
a165710e
...
@@ -228,7 +228,7 @@ class OC {
...
@@ -228,7 +228,7 @@ class OC {
public
static
function
checkConfig
()
{
public
static
function
checkConfig
()
{
$l
=
\OC
::
$server
->
getL10N
(
'lib'
);
$l
=
\OC
::
$server
->
getL10N
(
'lib'
);
// Create config i
n case
it does not already exist
s
// Create config i
f
it does not already exist
$configFilePath
=
self
::
$configDir
.
'/config.php'
;
$configFilePath
=
self
::
$configDir
.
'/config.php'
;
if
(
!
file_exists
(
$configFilePath
))
{
if
(
!
file_exists
(
$configFilePath
))
{
@
touch
(
$configFilePath
);
@
touch
(
$configFilePath
);
...
@@ -314,7 +314,7 @@ class OC {
...
@@ -314,7 +314,7 @@ class OC {
}
}
/**
/**
* check if the instance needs to p
r
eform an upgrade
* check if the instance needs to pe
r
form an upgrade
*
*
* @return bool
* @return bool
* @deprecated use \OCP\Util::needUpgrade() instead
* @deprecated use \OCP\Util::needUpgrade() instead
...
@@ -567,7 +567,7 @@ class OC {
...
@@ -567,7 +567,7 @@ class OC {
//try to configure php to enable big file uploads.
//try to configure php to enable big file uploads.
//this doesn´t work always depending on the webserver and php configuration.
//this doesn´t work always depending on the webserver and php configuration.
//Let´s try to overwrite some defaults anyway
s
//Let´s try to overwrite some defaults anyway
//try to set the maximum execution time to 60min
//try to set the maximum execution time to 60min
@
set_time_limit
(
3600
);
@
set_time_limit
(
3600
);
...
...
This diff is collapsed.
Click to expand it.
lib/private/activity/event.php
+
1
−
1
View file @
a165710e
...
@@ -90,7 +90,7 @@ class Event implements IEvent {
...
@@ -90,7 +90,7 @@ class Event implements IEvent {
}
}
/**
/**
* Set the
author
of the activity
* Set the
timestamp
of the activity
*
*
* @param int $timestamp
* @param int $timestamp
* @return IEvent
* @return IEvent
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment