Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
our_own_cloud_project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
die_coolen_jungs
our_own_cloud_project
Commits
92c8672c
Commit
92c8672c
authored
11 years ago
by
Thomas Müller
Browse files
Options
Downloads
Patches
Plain Diff
fixing PHPDoc comments and syntax
parent
f94a6eb1
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
lib/private/avatar.php
+3
-1
3 additions, 1 deletion
lib/private/avatar.php
lib/private/server.php
+2
-2
2 additions, 2 deletions
lib/private/server.php
lib/public/iservercontainer.php
+1
-1
1 addition, 1 deletion
lib/public/iservercontainer.php
with
6 additions
and
4 deletions
lib/private/avatar.php
+
3
−
1
View file @
92c8672c
...
...
@@ -54,7 +54,9 @@ class OC_Avatar implements \OCP\IAvatar {
$img
=
new
OC_Image
(
$data
);
$type
=
substr
(
$img
->
mimeType
(),
-
3
);
if
(
$type
===
'peg'
)
{
$type
=
'jpg'
;
}
if
(
$type
===
'peg'
)
{
$type
=
'jpg'
;
}
if
(
$type
!==
'jpg'
&&
$type
!==
'png'
)
{
$l
=
\OC_L10N
::
get
(
'lib'
);
throw
new
\Exception
(
$l
->
t
(
"Unknown filetype"
));
...
...
This diff is collapsed.
Click to expand it.
lib/private/server.php
+
2
−
2
View file @
92c8672c
...
...
@@ -132,7 +132,7 @@ class Server extends SimpleContainer implements IServerContainer {
return
new
ActivityManager
();
});
$this
->
registerService
(
'AvatarManager'
,
function
(
$c
)
{
return
new
AvatarManager
();
//TODO AvatarManager needs $user
return
new
AvatarManager
();
});
}
...
...
@@ -176,7 +176,7 @@ class Server extends SimpleContainer implements IServerContainer {
/**
* Returns the avatar manager, used for avatar functionality
*
* @return \OCP\IAvatar
* @return \OCP\IAvatar
Manager
*/
function
getAvatarManager
()
{
return
$this
->
query
(
'AvatarManager'
);
...
...
This diff is collapsed.
Click to expand it.
lib/public/iservercontainer.php
+
1
−
1
View file @
92c8672c
...
...
@@ -156,7 +156,7 @@ interface IServerContainer {
/**
* @brief Returns an avatar manager, used for avatar functionality
* @return \OCP\IAvatar
* @return \OCP\IAvatar
Manager
*/
function
getAvatarManager
();
...
...
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