Skip to content

Commit f98e142

Browse files
jmontoyaajmontoyaa
committed
Merge 1.11.x
2 parents 73a4a15 + 79f1e14 commit f98e142

File tree

93 files changed

+2095
-1133
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+2095
-1133
lines changed

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
app/home/*
1717

1818
app/logs/*
19-
app/Resources/translations/*
2019
app/Resources/views/*
2120

2221
# Upload content

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ generate the missing files.
7575

7676
On a Debian-based system, launch:
7777
```
78-
sudo chown -R www-data:www-data app main/default_course_document/images main/lang web
78+
sudo chown -R www-data:www-data app main/default_course_document/images main/lang web
7979
```
8080

8181
### Start the installer

‎app/AppKernel.php

+1
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ public function registerBundles()
111111
new Chamilo\NotificationBundle\ChamiloNotificationBundle(),
112112
new Chamilo\AdminBundle\ChamiloAdminBundle(),
113113
new Chamilo\TimelineBundle\ChamiloTimelineBundle(),
114+
new \Chamilo\ContactBundle\ChamiloContactBundle(),
114115

115116
// Based in Sonata
116117
new Chamilo\ClassificationBundle\ChamiloClassificationBundle(),

‎app/Resources/public/css/base.css

+9
Original file line numberDiff line numberDiff line change
@@ -5873,6 +5873,15 @@ a.sessionView {
58735873
color: black !important;
58745874
}
58755875

5876+
.skill-badge-img{
5877+
width: 150px;
5878+
overflow: hidden;
5879+
}
5880+
5881+
.text-light{
5882+
color: #00CCFF;
5883+
}
5884+
58765885

58775886
#dropzone {
58785887
position: relative;

‎app/config/config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ imports:
1212
- { resource: mopa/mopa_bootstrap.yml }
1313

1414
# FriendOfSymfony Bundles
15-
#- { resource: fos/fos_comment.yml }r
15+
#- { resource: fos/fos_comment.yml }
1616
# - { resource: fos/fos_rest.yml }
1717
- { resource: fos/fos_user.yml }
1818
#- { resource: fos/fos_elastica.yml }
@@ -82,7 +82,7 @@ twig:
8282

8383
form:
8484
resources:
85-
- 'bootstrap_3_layout.html.twig'
85+
- 'bootstrap_3_horizontal_layout.html.twig'
8686
- 'SonataFormatterBundle:Form:formatter.html.twig'
8787
- 'SonataMediaBundle:Form:media_widgets.html.twig'
8888
- 'SonataCoreBundle:Form:datepicker.html.twig'

‎app/config/parameters.yml.dist

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# Set parameters here that may be different on each deployment target of the app, e.g. development, staging, production.
33
# http://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
44
parameters:
5+
database_driver: pdo_mysql
56
database_host: 127.0.0.1
67
database_port: ~
78
database_name: chamilomaster
@@ -39,7 +40,7 @@ parameters:
3940
# sonata_media.cdn.host: /chamilo_master/web/uploads/media
4041

4142
sonata_page.varnish.command: 'if [ ! -r "/etc/varnish/secret" ]; then echo "VALID ERROR :/"; else varnishadm -S /etc/varnish/secret -T 127.0.0.1:6082 {{ COMMAND }} "{{ EXPRESSION }}"; fi;'
42-
locales: [en, fr, es]
43+
locales: [en, fr, es, de]
4344

4445
# Aspell Settings
4546
# aspell_bin: '/usr/bin/hunspell'

‎app/config/routing.yml

+4
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ chamilo_course:
4242
resource: "@ChamiloCourseBundle/Resources/config/routing.yml"
4343
prefix: /
4444

45+
chamilo_contact:
46+
resource: "@ChamiloContactBundle/Resources/config/routing.yml"
47+
prefix: /contact
48+
4549
_courses:
4650
resource: routing_courses.yml
4751

‎app/config/sonata/sonata_admin.yml

+1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ sonata_admin:
7474
items:
7575
- sonata.page.admin.page
7676
- sonata.page.admin.site
77+
- sonata.admin.contact_category
7778

7879
sonata.admin.group.faq:
7980
label: FAQ

‎app/config/sonata/sonata_page.yml

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ sonata_page:
4444
- ^/faq
4545
- ^/courses/(.*)
4646
- ^/front/editor
47+
- ^/contact(.*) # sonata admin
4748

4849
ignore_route_patterns:
4950
- (.*)administration(.*) # ignore admin route, ie route containing 'admin' # sonata admin

‎app/config/sonata/sonata_translation.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
lunetics_locale:
22
guessing_order:
3+
- session
34
- query
45
- router
5-
- session
6+
67
#- browser
78

89
allowed_locales: '%locales%'

‎composer.json

+6-5
Original file line numberDiff line numberDiff line change
@@ -114,22 +114,22 @@
114114
"sonata-project/seo-bundle": "~2.0",
115115
"sonata-project/doctrine-extensions": "~1@dev",
116116
"sonata-project/intl-bundle": "~2.2@dev",
117-
"sonata-project/admin-bundle": "~2.4@dev",
118-
"sonata-project/doctrine-orm-admin-bundle": "~2.4@dev",
117+
"sonata-project/admin-bundle": "dev-master as 2.4",
118+
"sonata-project/doctrine-orm-admin-bundle": "dev-master as 2.4",
119119
"sonata-project/notification-bundle": "~2.2@dev",
120120
"sonata-project/block-bundle": "~2.3@dev",
121121
"sonata-project/media-bundle": "~2.4@dev",
122122
"sonata-project/user-bundle": "~2.2@dev",
123123
"sonata-project/cache-bundle": "~2.1@dev",
124124
"sonata-project/cache": "~1.0@dev",
125-
"sonata-project/page-bundle": "~2.4@dev",
125+
"sonata-project/page-bundle": "dev-master",
126126
"sonata-project/core-bundle": "2.3.x-dev",
127127
"sonata-project/formatter-bundle": "~2.4@dev",
128128
"sonata-project/news-bundle": "~2.3@dev",
129129
"sonata-project/datagrid-bundle": "~2.2@dev",
130130
"sonata-project/exporter": "~1.3@dev",
131131
"sonata-project/timeline-bundle": "~2.3@dev",
132-
"sonata-project/classification-bundle": "~2.2@dev",
132+
"sonata-project/classification-bundle": "~2.3@dev",
133133
"sonata-project/comment-bundle": "~2.2@dev",
134134
"sonata-project/sonata-composer": "dev-master",
135135

@@ -171,7 +171,8 @@
171171
"gregwar/captcha-bundle": "^2.0",
172172
"ornicar/gravatar-bundle": "^1.1",
173173
"a2lix/translation-form-bundle": "~2.0",
174-
"knplabs/doctrine-behaviors": "~1.1"
174+
"knplabs/doctrine-behaviors": "~1.1",
175+
"jimmiw/php-time-ago": "^0.4.11"
175176
},
176177
"require-dev": {
177178
"behat/behat": "@stable",

‎documentation/changelog.html

+84
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,90 @@ <h3>Notable new Features</h3>
6363
</ul>
6464
<p>&nbsp;</p>
6565

66+
<a name="1.10.6"></a>
67+
68+
<h1>Chamilo 1.10.6 - ???, ?? of April 2016</h1>
69+
<h3>Release notes - summary</h3>
70+
<p>Chamilo 1.10.6 is a minor, bugfix release of the 1.10.x branch, with a few new features and bugfixes on top of 1.10.4.</p>
71+
<h3>Release name</h3>
72+
<p><a href="http://www.openstreetmap.org/node/1947201#map=14/51.3786/-2.3580">NNNh</a> .....</p>
73+
<h3>Security fixes</h3>
74+
<ul>
75+
<li>None that we know of.</li>
76+
</ul>
77+
<h3>Possibly breaking changes</h3>
78+
<ul>
79+
<li>None that we know of.</li>
80+
</ul>
81+
<h3>Notable new Features</h3>
82+
<h4>For end-users, teachers and Chamilo admins</h4>
83+
<ul>
84+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/10729dea98234918de3e7e8c8718503ba5e2efbd">10729dea</a> - <a href="https://task.beeznest.com/issues/10952">BT#10952</a>) Add multiple attachment in agenda</li>
85+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/940fbdd51c97e6feecebbd156130ba8818d98ad8">940fbdd5</a> - <a href="https://task.beeznest.com/issues/10052">BT#10052</a>) Adding setting "exercise_enable_category_order"</li>
86+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/6b51fae1a37d3c7b3f7c656e3631cb2eb50d028e">6b51fae1</a> - <a href="https://task.beeznest.com/issues/10052">BT#10052</a>) Add function needed for BT#10052</li>
87+
</ul>
88+
<h4>For developers and sysadmins</h4>
89+
<ul>
90+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/7b82a178a2059ca4784d66419ad8887d0745a5a0">7b82a178</a> - <a href="https://task.beeznest.com/issues/11005">BT#11005</a>) Save track_e_course_access before removing the session information</li>
91+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/12c7e7eccbf933ccf29306dcb720972792a9f8f2">12c7e7ec</a> - <a href="https://support.chamilo.org/issues/8175">#8175</a>) Use custom CKEditor</li>
92+
</ul>
93+
94+
<h3>Improvements (minor features) and debug</h3>
95+
<ul>
96+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/37d5af337e3ea895f6b5b7dec55e9dc4dbecfe2e">37d5af33</a>) Fix forms when adding/editing lp items</li>
97+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/36635d142199d3c8e6a5adbfd1b531dbbe85d318">36635d14</a>) Fix URL for create forum in lp</li>
98+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/1f0c917fc949132afbc50f070dd2bb3ef25f18a6">1f0c917f</a>) Fix report titles.</li>
99+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/90da1acf4666c7ec7e295d1d739cc0eb207cb68b">90da1acf</a>) Use api_get_course_info</li>
100+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/ece4c9d8f227f8fcf39bc4a2c995af8eb35c9d3b">ece4c9d8</a>) If in a session show all LPs not only LP added in session.</li>
101+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/5bcac3efc308d4c2dc4a6708f59b16bbc02c4206">5bcac3ef</a>) Fix constructor</li>
102+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/33dafb19fa049fa9b70263d4daf9fc0b8ab6292a">33dafb19</a> - <a href="https://task.beeznest.com/issues/11062">BT#11062</a>) Change scrollbar to scrollbar-light</li>
103+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/405b2c7bdf7918ef5a7c12f56a7b305eb74f3dd1">405b2c7b</a>) Add SMTP debug information</li>
104+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/10f30d19c69e5880cdca9d7adc19c1ccadb766ec">10f30d19</a>) Fix link</li>
105+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/5e5859107b0d6d247626bce7f6d1e308dc009bfc">5e585910</a>) Fix social group doesnt show in group list when adding an image (1.10.x)</li>
106+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/f34bae386d81c613c11411c921d81e7d9656cfd0">f34bae38</a> - <a href="https://support.chamilo.org/issues/8188">#8188</a>) Fix menu tabs (broken in 1.10.4)</li>
107+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/88b3acf7002421f9e7c60b1619d507bfd15c9d9d">88b3acf7</a> - <a href="https://support.chamilo.org/issues/8185">#8185</a>) Update bower assets</li>
108+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/cede17daf3925bfe56b108476dfb33140023d164">cede17da</a>) Use 1 setting instead of 2</li>
109+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/7f42c3251a15e3b91bc114fdd3db5ec8cb6dc04f">7f42c325</a>) Use __construct</li>
110+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/997288805472841bbfc3bf3caedf996f1db0acba">99728880</a> - <a href="https://support.chamilo.org/issues/8157">#8157</a>) Replace mysql with pdo_mysql extension</li>
111+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/c002d1e8f752b14e111e43ee65926eba37e558f7">c002d1e8</a>) Fix fatal error.</li>
112+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/64f6ccf359425a726f4be99df86c371ad59e9c16">64f6ccf3</a> - <a href="https://task.beeznest.com/issues/11021">BT#11021</a>) Remove button for download video file in lp</li>
113+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/380db06ab13e4524247999e92cb4065aeaf12ef1">380db06a</a> - <a href="https://task.beeznest.com/issues/11021">BT#11021</a>) Fix template for jplayer viewer</li>
114+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/ecf16fb37b0e14bd54ec624bf6055925f8d26366">ecf16fb3</a> - <a href="https://task.beeznest.com/issues/11021">BT#11021</a>) Show lp video items in iframe</li>
115+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/615a1224e97b16a510a65b1f9fe389f74aec011c">615a1224</a> - <a href="https://task.beeznest.com/issues/10936">BT#10936</a>) Set user id from function</li>
116+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/a231628dc85d72a6728c6b2a3360d8c94011817e">a231628d</a> - <a href="https://task.beeznest.com/issues/10936">BT#10936</a>) Fix fatal error</li>
117+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/db12470781fa479ed7c25d0a61af62eda07cb2af">db124707</a> - <a href="https://task.beeznest.com/issues/10936">BT#10936</a>) Fix fatal error</li>
118+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/8f864966c9bc725047b09270e21db891399fb1ab">8f864966</a> - <a href="https://support.chamilo.org/issues/8173">#8173</a>) Fix Renaming a document in upload document's form</li>
119+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/8f652341004346d57558183aa9f9134a97a58339">8f652341</a>) Fix select bootstrap overflow visible</li>
120+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/cec0161eff56dd0a81c778bfe24a2e7d618f1691">cec0161e</a> - <a href="https://support.chamilo.org/issues/8166">#8166</a>) Fix create course when doesn't exists an admin with id 1</li>
121+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/55c17b801c573e1f65fd036efaf1cd114040d3db">55c17b80</a> - <a href="https://task.beeznest.com/issues/10997">BT#10997</a>) Fix Migrations</li>
122+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/a1f5d466b7baec90de31b31a40a09f606e728404">a1f5d466</a> - <a href="https://support.chamilo.org/issues/8024">#8024</a>) Add clock-exercise.png</li>
123+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/d46b5c15141020c681d26fb46bd9242a6e5e12a1">d46b5c15</a> - <a href="https://support.chamilo.org/issues/8024">#8024</a>) Fixed css clock CT#8024</li>
124+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/4292a69177fb993561ad07aadce77fedfe0b4244">4292a691</a> - <a href="https://support.chamilo.org/issues/8154">#8154</a>) Fix attached files in mail</li>
125+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/6c56132f69b3124ed36d6a0f577b95bed6888580">6c56132f</a> - <a href="https://task.beeznest.com/issues/10997">BT#10997</a>) Remove condition hiding the user ID when teacher cannot subscribe students to course, because it causes the user_id data to be nullified, which prevents links to work properly</li>
126+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/bdb5a042a50d40c40b8775b241deb5b97b998d57">bdb5a042</a> - <a href="https://task.beeznest.com/issues/10979">BT#10979</a>) Fix and remove E_NOTICE when search_enabled is true</li>
127+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/798b6f52089b52092cd597b76eef0ec9e3a41c16">798b6f52</a> - <a href="https://support.chamilo.org/issues/8135">#8135</a>) Fix previous/next buttons in calendar</li>
128+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/28117fcfc2e04dcaa2528e589a45fcd72787db1f">28117fcf</a>) Fix issue with foreign keys when removing URLs and avoid a notice</li>
129+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/767d99cf540650ac8b43690986690f6c0964bb15">767d99cf</a> - <a href="https://task.beeznest.com/issues/10927">BT#10927</a>) Add from and too</li>
130+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/44706ef925530c642933112adc084cb313e05148">44706ef9</a> - <a href="https://support.chamilo.org/issues/8140">#8140</a>) Remove user from all portals</li>
131+
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/9f4f4a53ded2d67fd9416a8d10137277bcd5fefa">9f4f4a53</a> - <a href="https://task.beeznest.com/issues/10979">BT#10979</a>) Fix E_NOTICEs when search_enabled is true</li>
132+
</ul>
133+
<h3>Stylesheets and theming</h3>
134+
<ul>
135+
<li>None that we know of.</li>
136+
</ul>
137+
<h3>Web services</h3>
138+
<ul>
139+
<li>None that we know of.</li>
140+
</ul>
141+
<h3>Removals</h3>
142+
<ul>
143+
<li>None that we know of.</li>
144+
</ul>
145+
<h3>Known issues</h3>
146+
<ul>
147+
<li>IMS/QTI import/export has issues</li>
148+
<li>In Internet Explorer 9, learning paths might not show other pages than the first to be opened. We lacked computers with IE9 at the time of release of 1.10.4. Guaranteeing IE9 support will likely require additional services. See <a href="https://support.chamilo.org/issues/8075">the corresponding bug report</a></li>
149+
</ul>
66150

67151
<a name="1.10.4"></a>
68152

‎main/badge/issued.php

+11
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,17 @@
6161
'courses' => []
6262
];
6363

64+
65+
66+
// Open Graph Markup
67+
$htmlHeadXtra[] = "
68+
<meta property='og:type' content='article' />
69+
<meta property='og:title' content='".sprintf(get_lang('IHaveObtainedSkillXOnY'), $skillInfo['name'], api_get_setting('siteName'))."' />
70+
<meta property='og:url' content='".api_get_path(WEB_PATH)."badge/".$skillId."/user/".$userId."' />
71+
<meta property='og:description' content='".$skillInfo['description']."' />
72+
<meta property='og:image' content='".$skillInfo['badge_image']."' />
73+
";
74+
6475
$badgeAssertions = [];
6576

6677
foreach ($userSkills as $userSkill) {

‎main/course_info/infocours.php

+17-4
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,13 @@ function is_settings_editable()
177177
);
178178
$form->addElement('select_language', 'course_language', array(get_lang('Ln'), get_lang('TipLang')));
179179

180+
$group = array(
181+
$form->createElement('radio', 'show_course_in_user_language', null, get_lang('Yes'), 1),
182+
$form->createElement('radio', 'show_course_in_user_language', null, get_lang('No'), 2),
183+
);
184+
185+
$form->addGroup($group, '', array(get_lang("ShowCourseInUserLanguage")), '');
186+
180187
$form->addText('department_name', get_lang('Department'), false);
181188
$form->applyFilter('department_name', 'html_filter');
182189
$form->applyFilter('department_name', 'trim');
@@ -203,8 +210,12 @@ function is_settings_editable()
203210
');
204211
$form->addHidden('cropResult', '');
205212
$allowed_picture_types = array ('jpg', 'jpeg', 'png', 'gif');
206-
$form->addRule('picture', get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')', 'filetype', $allowed_picture_types);
207-
//$form->addElement('html', '<div class="form-group "><div class="col-md-2"></div> <div class="col-md-8 help-image">'.get_lang('UniqueAnswerImagePreferredSize200x150').'</div></div>');
213+
$form->addRule(
214+
'picture',
215+
get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')',
216+
'filetype',
217+
$allowed_picture_types
218+
);
208219
$form->addElement('checkbox', 'delete_picture', null, get_lang('DeletePicture'));
209220

210221
if (api_get_setting('document.pdf_export_watermark_by_course') == 'true') {
@@ -450,12 +461,14 @@ function is_settings_editable()
450461
$form->addElement('html', '</div></div>');
451462

452463
// Document settings
453-
$form->addElement('html', '<div><h3>'.Display::return_icon('folder.png', Security::remove_XSS(get_lang('Documents')),'',ICON_SIZE_SMALL).' '.Security::remove_XSS(get_lang('Documents')).'</h3><div>');
464+
$form->addElement(
465+
'html',
466+
'<div><h3>'.Display::return_icon('folder.png', Security::remove_XSS(get_lang('Documents')),'',ICON_SIZE_SMALL).' '.Security::remove_XSS(get_lang('Documents')).'</h3><div>'
467+
);
454468

455469
$group = array(
456470
$form->createElement('radio', 'show_system_folders', null, get_lang('Yes'), 1),
457471
$form->createElement('radio', 'show_system_folders', null, get_lang('No'), 2),
458-
459472
);
460473
$form->addGroup($group, '', array(get_lang("ShowSystemFolders")), '');
461474
$form->addButtonSave(get_lang('SaveSettings'), 'submit_save');

‎main/document/document.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1794,7 +1794,7 @@ function convertModal (id, format) {
17941794

17951795
// Last edit date
17961796
$last_edit_date = api_get_local_time($document_data['lastedit_date']);
1797-
$display_date = date_to_str_ago($last_edit_date).
1797+
$display_date = date_to_str_ago($document_data['lastedit_date']).
17981798
' <div class="muted"><small>'.$last_edit_date."</small></div>";
17991799

18001800
$row[] = $invisibility_span_open.$display_date.$invisibility_span_close;

‎main/document/edit_document.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -469,8 +469,8 @@
469469

470470
if (!$group_document && !DocumentManager::is_my_shared_folder(api_get_user_id(), $currentDirPath, $sessionId)) {
471471
// Updated on field
472-
$last_edit_date = api_get_local_time($last_edit_date);
473-
$display_date = date_to_str_ago($last_edit_date).' <span class="dropbox_date">'.api_format_date($last_edit_date).'</span>';
472+
$display_date = date_to_str_ago($last_edit_date).
473+
' <span class="dropbox_date">'.api_format_date(api_get_local_time($last_edit_date)).'</span>';
474474
$form->addElement('static', null, get_lang('UpdatedOn'), $display_date);
475475
}
476476

0 commit comments

Comments
 (0)