diff options
| author | friendica <info@friendica.com> | 2014-12-29 23:58:14 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-12-29 23:58:14 -0800 |
| commit | 2f650b74d35335815c48537cd03c81cc92a3c4f8 (patch) | |
| tree | d209405166df963a8cca626fb53dc69a9e0b3872 /include | |
| parent | 5cfe0511391e391d46b91efaa8df3501d498fd21 (diff) | |
| parent | 9b2c71a5dcdeb7ef7a1b1e09ad906bc750b1d0d6 (diff) | |
| download | volse-hubzilla-2f650b74d35335815c48537cd03c81cc92a3c4f8.tar.gz volse-hubzilla-2f650b74d35335815c48537cd03c81cc92a3c4f8.tar.bz2 volse-hubzilla-2f650b74d35335815c48537cd03c81cc92a3c4f8.zip | |
Merge branch 'master' into trinidad
Diffstat (limited to 'include')
| -rw-r--r-- | include/auth.php | 2 | ||||
| -rw-r--r-- | include/bbcode.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/auth.php b/include/auth.php index 545fbe8c9..c4bbaf546 100644 --- a/include/auth.php +++ b/include/auth.php @@ -283,7 +283,7 @@ else { @file_put_contents($authlog, datetime_convert() . ':' . session_id() . ' ' . $error . "\n", FILE_APPEND); notice( t('Login failed.') . EOL ); - goaway(z_root()); + goaway(z_root() . '/login'); } // If the user specified to remember the authentication, then change the cookie diff --git a/include/bbcode.php b/include/bbcode.php index 9445eb007..ab56bda61 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -22,7 +22,7 @@ function tryzrlaudio($match) { $zrl = is_matrix_url($link); if($zrl) $link = zid($link); - return '<audio src="' . $link . '" controls="controls" ><a href="' . $link . '">' . $link . '</a></audio>'; + return '<audio src="' . str_replace(' ','%20',$link) . '" controls="controls" ><a href="' . str_replace(' ','%20',$link) . '">' . $link . '</a></audio>'; } function tryzrlvideo($match) { @@ -30,7 +30,7 @@ function tryzrlvideo($match) { $zrl = is_matrix_url($link); if($zrl) $link = zid($link); - return '<video controls="controls" src="' . $link . '" style="width:100%; max-width:' . get_app()->videowidth . 'px"><a href="' . $link . '">' . $link . '</a></video>'; + return '<video controls="controls" src="' . str_replace(' ','%20',$link) . '" style="width:100%; max-width:' . get_app()->videowidth . 'px"><a href="' . str_replace(' ','%20',$link) . '">' . $link . '</a></video>'; } |