diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-19 17:05:59 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-19 17:05:59 -0700 |
| commit | 6a4573b935cb7d451156b2a98622bad0dfa1f0cd (patch) | |
| tree | 85d0df320707748239f4f6e99c4112dd9cfb5c6d | |
| parent | 7272b97e9a50ff6070a38196aa0b080a993f776d (diff) | |
| parent | 9421e42dad0bee6e0aa292d390cf249e1d7f7df4 (diff) | |
| download | volse-hubzilla-6a4573b935cb7d451156b2a98622bad0dfa1f0cd.tar.gz volse-hubzilla-6a4573b935cb7d451156b2a98622bad0dfa1f0cd.tar.bz2 volse-hubzilla-6a4573b935cb7d451156b2a98622bad0dfa1f0cd.zip | |
Merge branch 'dev' into perms
| -rw-r--r-- | Zotlabs/Storage/BasicAuth.php | 2 | ||||
| -rwxr-xr-x | include/plugin.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Zotlabs/Storage/BasicAuth.php b/Zotlabs/Storage/BasicAuth.php index 60fc2c988..9c73b47b9 100644 --- a/Zotlabs/Storage/BasicAuth.php +++ b/Zotlabs/Storage/BasicAuth.php @@ -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. * diff --git a/include/plugin.php b/include/plugin.php index 6dfda1cc9..cb206d944 100755 --- a/include/plugin.php +++ b/include/plugin.php @@ -626,6 +626,7 @@ function head_get_js() { $str = ''; if(App::$js_sources) { + ksort(App::$js_sources,SORT_NUMERIC); foreach(App::$js_sources as $sources) { if(count($sources)) { foreach($sources as $source) { |