diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-01-29 11:39:22 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-01-29 11:39:22 -0800 |
| commit | e4d9ea3394ee2db82d9dee6c6ed78543fd0f78fb (patch) | |
| tree | 85759cfef46cc1df79a1ddf3225dce8809b9121a /modules/gallery/libraries/InPlaceEdit.php | |
| parent | 1bc0d05760df7bff5cee0a330b5b7181b3c49835 (diff) | |
| parent | 660130cf1ab9fd6cb051712b57966b191064a6a6 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Conflicts:
modules/gallery/views/in_place_edit.html.php
Diffstat (limited to 'modules/gallery/libraries/InPlaceEdit.php')
| -rw-r--r-- | modules/gallery/libraries/InPlaceEdit.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/modules/gallery/libraries/InPlaceEdit.php b/modules/gallery/libraries/InPlaceEdit.php index 67ab3805..04a2e9a5 100644 --- a/modules/gallery/libraries/InPlaceEdit.php +++ b/modules/gallery/libraries/InPlaceEdit.php @@ -70,7 +70,6 @@ class InPlaceEdit_Core { public function render() { $v = new View("in_place_edit.html"); - $v->hidden = array("csrf" => access::csrf_token()); $v->action = url::site($this->action); $v->form = $this->form; $v->errors = $this->errors; |