Skip to content

Commit 8031a60

Browse files
committed
Merge branch 'release-1.0'
2 parents d8a6b96 + 87a86b9 commit 8031a60

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

README

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ or it can act as a host for many people all from the same installation.
44
Released under an Apache 2.0 License (see LICENSE).
55
All documentation and tutorials available on http://storytlr.org
66

7-
Version 0.9.4 Release Candidate 1 - August 12th
7+
Release 1.0 - August 19 2010

index.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
define("STORYTLR_VERSION","0.9.4-rc1");
2+
define("STORYTLR_VERSION","1.0.0");
33
define("DATABASE_VERSION", "1");
44
define("AUTO_INSTALL", true);
55
define("AUTO_UPGRADE", true);

protected/application/admin/controllers/AuthController.php

+9-7
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,14 @@ public function loginAction()
109109
// Send the cookie with the authentication data
110110
$cookie = new Stuffpress_Cookie($user->id);
111111
$cookie->set($remember);
112-
112+
113+
$config = Zend_Registry::get('configuration');
114+
$domain = trim($config->web->host, " /");
115+
$path = trim($config->web->path, " /");
116+
117+
113118
// If we have a special target
114-
if ($values['target'] == 'user_page') {
115-
$config = Zend_Registry::get('configuration');
116-
$domain = trim($config->web->host, " /");
117-
$path = trim($config->web->path, " /");
118-
119+
if ($values['target'] == 'user_page') {
119120
// If single user, we go back to the host
120121
if (isset($config->app->user)) {
121122
$url = "http://$domain/$path";
@@ -126,7 +127,8 @@ public function loginAction()
126127
return $this->_redirect($url);
127128
}
128129
else if ($values['target']) {
129-
return $this->_redirect($values['target']);
130+
$target = trim($values['target'], " /");
131+
return $this->_redirect("http://$domain/$target");
130132
}
131133

132134
// Otherwise we go back to the home page

0 commit comments

Comments
 (0)