fixing variables problem

ahegazy · ahegazy · commit ed51bf88c4c7 · 2019-02-26T22:03:05.000+02:00
diff --git a/app/core/App.php b/app/core/App.php
@@ -22,10 +22,10 @@ public function __construct(){
         
         //setting the langauge to default language if not specified.
 
-        if(file_exists('../app/languages/' . $req[0])){
+        if($req != NULL && file_exists('../app/languages/' . $req[0])){
             define('LANGUAGE', array_shift($req));                    
         }else{
-            define('LANGUAGE', $language);
+            define('LANGUAGE', $this->language);
         }
 
         if(file_exists('../app/controllers/' . $req[0] . '.php')){
diff --git a/app/core/Controller.php b/app/core/Controller.php
@@ -44,13 +44,13 @@ public function view($view, $data = []){
         */
         if(!isset($data['lang']['main'])){
             require_once("../app/languages/" . LANGUAGE . "/main.php");
-            $data['lang']['main'] = $lang;
+            $data['lang']['main'] = LANGUAGE;
          }
  
         $data['view'] = $view;
         if(!isset($data['lang'][$view])){
            require_once("../app/languages/" . LANGUAGE . "/". $view .".php");
-           $data['lang'][$view] = $lang;
+           $data['lang'][$view] = LANGUAGE;
         }
 
         //including the header, the view and the footer    

Original file line number	Diff line number	Diff line change
`@@ -44,13 +44,13 @@ public function view($view, $data = []){`
`44`	`44`	`*/`
`45`	`45`	`if(!isset($data['lang']['main'])){`
`46`	`46`	`require_once("../app/languages/" . LANGUAGE . "/main.php");`
`47`		`- $data['lang']['main'] = $lang;`
	`47`	`+ $data['lang']['main'] = LANGUAGE;`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`$data['view'] = $view;`
`51`	`51`	`if(!isset($data['lang'][$view])){`
`52`	`52`	`require_once("../app/languages/" . LANGUAGE . "/". $view .".php");`
`53`		`- $data['lang'][$view] = $lang;`
	`53`	`+ $data['lang'][$view] = LANGUAGE;`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`//including the header, the view and the footer`