diff options
| author | Michael Meer <michael@meer.name> | 2014-01-28 09:49:09 +0100 |
|---|---|---|
| committer | Michael Meer <michael@meer.name> | 2014-01-28 09:49:09 +0100 |
| commit | 8ddee71c2b0f384470965dd46a2e594a4f98f8e0 (patch) | |
| tree | 84bcf6e0f94365b186b4613b43d7a72f5f22f525 /view | |
| parent | 904db593df914d2932d9c2f018b00987052461d7 (diff) | |
| parent | f104b4dc275891785ec03abd779d8aafe5163815 (diff) | |
| download | volse-hubzilla-8ddee71c2b0f384470965dd46a2e594a4f98f8e0.tar.gz volse-hubzilla-8ddee71c2b0f384470965dd46a2e594a4f98f8e0.tar.bz2 volse-hubzilla-8ddee71c2b0f384470965dd46a2e594a4f98f8e0.zip | |
Merge branch 'master' of https://github.com/friendica/red
to be in sync with main repro
Diffstat (limited to 'view')
| -rw-r--r-- | view/php/theme_init.php | 1 | ||||
| -rwxr-xr-x | view/tpl/photo_view.tpl | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 0e473f728..b6aa5de0f 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -44,6 +44,7 @@ head_add_js('docready.js'); head_add_js('library/colorbox/jquery.colorbox-min.js'); head_add_js('library/bootstrap-datetimepicker/js/moment.js'); head_add_js('library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js'); + /** * Those who require this feature will know what to do with it. * Those who don't, won't. diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index e56fd5b57..93e9abfa5 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -24,7 +24,7 @@ <div id="photo-edit-edit" style="display: none;"> <form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form" > - <input type="hidden" name="item_id" value="{{$item_id}}" /> + <input type="hidden" name="item_id" value="{{$edit.item_id}}" /> <label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$edit.newalbum}}</label> <input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$edit.album}}" /> |