diff options
author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-13 22:41:45 -0400 |
---|---|---|
committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-13 22:41:45 -0400 |
commit | a2073bcfc05abadc3e967f40c66d1fa674bba0d3 (patch) | |
tree | 6f0412fba9934257465217c9cae283b626d7fb70 /view/settings_oauth.tpl | |
parent | 1763a6c9c2a80642291e13f80be8a092465924ae (diff) | |
parent | de017d1ed76500c01fd11c8e1d36cf4ebd70172d (diff) | |
download | volse-hubzilla-a2073bcfc05abadc3e967f40c66d1fa674bba0d3.tar.gz volse-hubzilla-a2073bcfc05abadc3e967f40c66d1fa674bba0d3.tar.bz2 volse-hubzilla-a2073bcfc05abadc3e967f40c66d1fa674bba0d3.zip |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
sort inbox by recently replied conversations first
file as widget and basic filing implementation for duepuntozero,slackr much more work needed - this is just for test/evaluation currently
don't count self in number of contatcs
invite potential connectees to the free social web
In HTML2BBCode: fetch the URL of [EMBED] using JavaScript instead of an ajax-call to a php-script. Once there actually is embedded Code in the HTML, this function is called after every single keypress. Not only is making an ajax-call every keypress bandith intensive - it also made typing hard / slow. Making a lot of JavaScript-RegExp-Computation every keypress isn't exactly great either, but still performs better.
Some security against XSRF-attacks
A 'PHP Fatal error: Call to a member function getElementsByTagName() on a non-object in mod/parse_url.php on line 191' occurred when the linked HTML-File doesn't have a HEAD. The HTML-file couln't be link to in the editor therefore.
Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.php
Avoid notices
contact.network is used later to check if a direct link or a redirect by /redir/contactid should be used
wasn't actually changed before
Avoid a notice
Avoid a Notice
Avoid a Notice
Avoid a Notice
* master:
Diffstat (limited to 'view/settings_oauth.tpl')
-rwxr-xr-x | view/settings_oauth.tpl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/view/settings_oauth.tpl b/view/settings_oauth.tpl index 0de0dbe98..da1398ab9 100755 --- a/view/settings_oauth.tpl +++ b/view/settings_oauth.tpl @@ -4,7 +4,8 @@ $tabs <form action="settings/oauth" method="post" autocomplete="off"> - +<input type='hidden' name='form_security_token' value='$form_security_token'> + <div id="profile-edit-links"> <ul> <li> @@ -24,7 +25,7 @@ $tabs {{ endif }} {{ if $app.my }} <a href="$baseurl/settings/oauth/edit/$app.client_id" class="icon s22 edit" title="$edit"> </a> - <a href="$baseurl/settings/oauth/delete/$app.client_id" class="icon s22 delete" title="$delete"> </a> + <a href="$baseurl/settings/oauth/delete/$app.client_id?t=$form_security_token" class="icon s22 delete" title="$delete"> </a> {{ endif }} </div> {{ endfor }} |