mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 13:17:24 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3287 from SimSync/userprofile_legacyurl

Browse Source 
Fixed issue with legacy url (goto settings) on user profile page
This commit is contained in:
Cameron
2018-07-15 12:22:29 -07:00
committed by GitHub
parent 91374a0dde e6e8a304a9
commit 327bee29cd
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_core/shortcodes/batch/user_shortcodes.php
View File

@@ -525,7 +525,8 @@ class user_shortcodes extends e_shortcode
if (USERID == $this->var['user_id']) if (USERID == $this->var['user_id'])
{ {
//return "<a href='".$url->create('user/myprofile/edit')."'>".LAN_USER_38."</a>"; //return "<a href='".$url->create('user/myprofile/edit')."'>".LAN_USER_38."</a>";
return "<a class='btn btn-default' href='".e_HTTP."usersettings.php'>".LAN_USER_38."</a>"; // TODO: repair dirty fix for usersettings //return "<a class='btn btn-default' href='".e_HTTP."usersettings.php'>".LAN_USER_38."</a>"; // TODO: repair dirty fix for usersettings
return "<a class='btn btn-default' href='".$url->create('user/myprofile/edit')."'>".LAN_USER_38."</a>"; // TODO: repair dirty fix for usersettings
} }
else if(ADMIN && getperms("4") && !$this->var['user_admin']) else if(ADMIN && getperms("4") && !$this->var['user_admin'])
{ {
@@ -534,6 +535,7 @@ class user_shortcodes extends e_shortcode
return "<a class='btn btn-default' href='".$editUrl."'>".LAN_USER_39."</a>"; return "<a class='btn btn-default' href='".$editUrl."'>".LAN_USER_39."</a>";
// return "<a class='btn btn-default' href='".$url->create('user/profile/edit', array('id' => $this->var['user_id'], 'name' => $this->var['user_name']))."'>".LAN_USER_39."</a>"; // return "<a class='btn btn-default' href='".$url->create('user/profile/edit', array('id' => $this->var['user_id'], 'name' => $this->var['user_name']))."'>".LAN_USER_39."</a>";
} }
} }

9
e107_core/url/user/url.php
View File

@@ -42,7 +42,8 @@ class core_user_url extends eUrlConfig
*/ */
public function create($route, $params = array(), $options = array()) public function create($route, $params = array(), $options = array())
{ {
if(!$params) return 'user.php'; // Some routes require no params
//if(!$params) return 'user.php';
if(is_string($route)) $route = explode('/', $route, 2); if(is_string($route)) $route = explode('/', $route, 2);
if(!varset($route[1])) $route[1] = 'index'; if(!varset($route[1])) $route[1] = 'index';
@@ -56,6 +57,9 @@ class core_user_url extends eUrlConfig
if($route[0] == 'profile') if($route[0] == 'profile')
{ {
// Params required for user view, list & edit
if(!$params) return 'user.php';
switch ($route[1]) switch ($route[1])
{ {
case '': case '':
@@ -68,7 +72,8 @@ class core_user_url extends eUrlConfig
break; break;
case 'edit': case 'edit':
$url = e_ADMIN_ABS."user.php?mode=main&action=edit&id=".$params['id'];// 'usersettings.php?'.$params['id']; //$url = e_ADMIN_ABS."user.php?mode=main&action=edit&id=".$params['id'];// 'usersettings.php?'.$params['id'];
$url = e_ADMIN."users.php?mode=main&action=edit&id=".$params['id'];// 'usersettings.php?'.$params['id'];
break; break;
} }
} }