dyjh %!s(int64=6) %!d(string=hai) anos
pai
achega
625e4e6d1e
Modificáronse 1 ficheiros con 4 adicións e 3 borrados
  1. 4 3
      app/Helper/functions.inc.php

+ 4 - 3
app/Helper/functions.inc.php

@@ -197,9 +197,10 @@ function U ($url, $query = [])
     $is_we7 = session()->get('is_we7');
     $is_we7 = session()->get('is_we7');
     if($is_we7){
     if($is_we7){
         $adminUri = '?route=';
         $adminUri = '?route=';
+    }else{
+        $adminUri = '';
     }
     }
     $url = ltrim($url, '/');
     $url = ltrim($url, '/');
-    dd($url);
     $urlInfo = parse_url($url);
     $urlInfo = parse_url($url);
     $aQuery = [];
     $aQuery = [];
 
 
@@ -208,9 +209,9 @@ function U ($url, $query = [])
     }
     }
     $queryString = http_build_query(array_merge($aQuery, $query));
     $queryString = http_build_query(array_merge($aQuery, $query));
     if(isset($urlInfo['host'])) {
     if(isset($urlInfo['host'])) {
-        $url = $urlInfo['scheme'] . '://' . $urlInfo['host'].'/admin/';
+        $url = $urlInfo['scheme'] . '://' . $urlInfo['host'].'/' . $adminUri . 'admin/';
     }else{
     }else{
-        $url = request()->root() . '/admin/';
+        $url = request()->root() . '/' . $adminUri . 'admin/';
     }
     }
     $url .= isset($urlInfo['path']) ? $urlInfo['path'] : '';
     $url .= isset($urlInfo['path']) ? $urlInfo['path'] : '';
     $url .= $queryString === '' ? '' : ('?'.$queryString);
     $url .= $queryString === '' ? '' : ('?'.$queryString);