mirror/php-monstra
1
0
Fork 0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-08-06 21:26:58 +02:00
Code Issues Releases Wiki Activity

Site Url without trailing slashes

Browse Source
This commit is contained in:
Евгений
2014-01-07 01:32:50 +06:00
parent 5cb23c76c3
commit e60fb9921e
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin/index.php
View File

@@ -131,7 +131,7 @@ if (Request::post('reset_password_submit')) {
Notification::set('reset_password', 'reset_password'); Notification::set('reset_password', 'reset_password');
// Redirect to password-reset page // Redirect to password-reset page
Request::redirect(Site::url().'admin'); Request::redirect(Site::url().'/admin');
} }

4
plugins/box/pages/views/frontend/breadcrumbs.view.php
View File

@@ -1,5 +1,5 @@
<?php if ($parent) { ?> <?php if ($parent) { ?>
<a href="<?php echo Site::url().$page['parent']; ?>"><?php echo $parent_page['title']; ?></a>&nbsp;<span>&rarr;</span>&nbsp;<a href="<?php echo Site::url().$page['parent'].'/'.$page['slug']; ?>"><?php echo $page['title']; ?></a> <a href="<?php echo Site::url().'/'.$page['parent']; ?>"><?php echo $parent_page['title']; ?></a>&nbsp;<span>&rarr;</span>&nbsp;<a href="<?php echo Site::url().'/'.$page['parent'].'/'.$page['slug']; ?>"><?php echo $page['title']; ?></a>
<?php } else { ?> <?php } else { ?>
<a href="<?php echo Site::url().$page['slug']; ?>"><?php echo $page['title']; ?></a> <a href="<?php echo Site::url().'/'.$page['slug']; ?>"><?php echo $page['title']; ?></a>
<?php } <?php }

14
plugins/box/users/users.plugin.php
View File

@@ -170,7 +170,7 @@ class Users extends Frontend
->display(); ->display();
} else { } else {
Request::redirect(Site::url().'users/'.Session::get('user_id')); Request::redirect(Site::url().'/users/'.Session::get('user_id'));
} }
} else { } else {
@@ -240,7 +240,7 @@ class Users extends Frontend
} }
Notification::set('success', __('Your changes have been saved.', 'users')); Notification::set('success', __('Your changes have been saved.', 'users'));
Request::redirect(Site::url().'users/'.$user['id']); Request::redirect(Site::url().'/users/'.$user['id']);
} }
} else { } } else { }
@@ -253,7 +253,7 @@ class Users extends Frontend
->display(); ->display();
} else { } else {
Request::redirect(Site::url().'users/login'); Request::redirect(Site::url().'/users/login');
} }
} }
@@ -307,7 +307,7 @@ class Users extends Frontend
Notification::set('success', __('New password has been sent', 'users')); Notification::set('success', __('New password has been sent', 'users'));
// Redirect to password-reset page // Redirect to password-reset page
Request::redirect(Site::url().'users/password-reset'); Request::redirect(Site::url().'/users/password-reset');
} }
} }
@@ -356,7 +356,7 @@ class Users extends Frontend
Notification::set('success', __('Your login details for :site_name has been sent', 'users', array(':site_name' => $site_name))); Notification::set('success', __('Your login details for :site_name has been sent', 'users', array(':site_name' => $site_name)));
// Redirect to password-reset page // Redirect to password-reset page
Request::redirect(Site::url().'users/password-reset'); Request::redirect(Site::url().'/users/password-reset');
} }
@@ -403,7 +403,7 @@ class Users extends Frontend
Session::set('user_id', (int) $user['id']); Session::set('user_id', (int) $user['id']);
Session::set('user_login', (string) $user['login']); Session::set('user_login', (string) $user['login']);
Session::set('user_role', (string) $user['role']); Session::set('user_role', (string) $user['role']);
Request::redirect(Site::url().'users/'.Session::get('user_id')); Request::redirect(Site::url().'/users/'.Session::get('user_id'));
} else { } else {
Notification::setNow('error', __('Wrong <b>username</b> or <b>password</b>', 'users')); Notification::setNow('error', __('Wrong <b>username</b> or <b>password</b>', 'users'));
@@ -440,7 +440,7 @@ class Users extends Frontend
View::factory('box/users/views/frontend/login')->display(); View::factory('box/users/views/frontend/login')->display();
} else { } else {
Request::redirect(Site::url().'users/'.Session::get('user_id')); Request::redirect(Site::url().'/users/'.Session::get('user_id'));
} }
} }

2
public/themes/default/footer-links.chunk.php
View File

@@ -1 +1 @@
<a href="<?php echo Site::url(); ?>sitemap"><?php echo __('Sitemap', 'sitemap'); ?></a> <a href="<?php echo Site::url(); ?>/sitemap"><?php echo __('Sitemap', 'sitemap'); ?></a>

4
public/themes/default/header.chunk.php
View File

@@ -32,8 +32,8 @@
<![endif]--> <![endif]-->
<!-- Fav icons --> <!-- Fav icons -->
<link rel="icon" href="<?php echo Site::url(); ?>favicon.ico" type="image/x-icon"> <link rel="icon" href="<?php echo Site::url(); ?>/favicon.ico" type="image/x-icon">
<link rel="shortcut icon" href="<?php echo Site::url(); ?>favicon.ico" type="image/x-icon"> <link rel="shortcut icon" href="<?php echo Site::url(); ?>/favicon.ico" type="image/x-icon">
</head> </head>
<body> <body>