diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-12-07 16:15:52 -0800 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-12-07 16:15:52 -0800 |
| commit | 241607e7d73d9bdbbae253b73de91c3847c6df76 (patch) | |
| tree | cc62b12c3d8599d0c63d9c4ed05e8284f18b5815 /include | |
| parent | bd7d851758e9fdedade6458049a8fbc799da6eba (diff) | |
| parent | 96d94551f92aeca5efdee6286e7950229c46f201 (diff) | |
| download | volse-hubzilla-241607e7d73d9bdbbae253b73de91c3847c6df76.tar.gz volse-hubzilla-241607e7d73d9bdbbae253b73de91c3847c6df76.tar.bz2 volse-hubzilla-241607e7d73d9bdbbae253b73de91c3847c6df76.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/RedDAV/RedBrowser.php | 2 | ||||
| -rw-r--r-- | include/widgets.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/RedDAV/RedBrowser.php b/include/RedDAV/RedBrowser.php index efea5d92f..1aa5f435e 100644 --- a/include/RedDAV/RedBrowser.php +++ b/include/RedDAV/RedBrowser.php @@ -188,7 +188,7 @@ class RedBrowser extends DAV\Browser\Plugin { $parentHash = ''; $owner = $this->auth->owner_id; - $splitPath = split('/', $fullPath); + $splitPath = explode('/', $fullPath); if (count($splitPath) > 3) { for ($i = 3; $i < count($splitPath); $i++) { $attachName = urldecode($splitPath[$i]); diff --git a/include/widgets.php b/include/widgets.php index 89836f90c..4b14d6c94 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -1299,7 +1299,6 @@ function widget_album($args) { //edit album name $album_edit = null; - $photos = array(); if($r) { $twist = 'rotright'; @@ -1338,6 +1337,7 @@ function widget_album($args) { $o .= replace_macros($tpl, array( '$photos' => $photos, '$album' => (($title) ? $title : $album), + '$album_id' => rand(), '$album_edit' => array(t('Edit Album'), $album_edit), '$can_post' => false, '$upload' => array(t('Upload'), z_root() . '/photos/' . get_app()->profile['channel_address'] . '/upload/' . bin2hex($album)), |