Merge branch 'master' of http://github.com/opencart/opencart

opencart · Aug 1, 2015 · 743c306 · 743c306
2 parents 8bc3f57 + f368b3e
commit 743c306
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/upload/admin/controller/payment/worldpay.php b/upload/admin/controller/payment/worldpay.php
@@ -344,7 +344,7 @@ public function refund() {
 	}
 
 	protected function validate() {
-		if (!$this->user->hasPermission('modify', 'payment/realex')) {
+		if (!$this->user->hasPermission('modify', 'payment/worldpay')) {
 			$this->error['warning'] = $this->language->get('error_permission');
 		}
 

diff --git a/upload/system/library/language.php b/upload/system/library/language.php
@@ -32,5 +32,7 @@ public function load($filename) {
 		}
 
 		$this->data = array_merge($this->data, $_);
+
+		return $this->data;
 	}
 }