harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into perms

Browse Source
This commit is contained in:
redmatrix 2016-07-19 17:05:59 -07:00
commit 6a4573b935
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Storage/BasicAuth.php
View File

@ -231,7 +231,7 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic {
} }
/** /**
* @brief Sets the timezone from the channel in RedBasicAuth. * @brief Sets the timezone from the channel in BasicAuth.
* *
* Set in mod/cloud.php if the channel has a timezone set. * Set in mod/cloud.php if the channel has a timezone set.
* *

1
include/plugin.php
View File

@ -626,6 +626,7 @@ function head_get_js() {
$str = ''; $str = '';
if(App::$js_sources) { if(App::$js_sources) {
ksort(App::$js_sources,SORT_NUMERIC);
foreach(App::$js_sources as $sources) { foreach(App::$js_sources as $sources) {
if(count($sources)) { if(count($sources)) {
foreach($sources as $source) { foreach($sources as $source) {