Merge pull request #1 from opencart/master

master branche updates
profitlanding · Nov 5, 2015 · ce12b5c · ce12b5c
2 parents 58deb16 + 76a772f
commit ce12b5c
Show file tree

Hide file tree

Showing 394 changed files with 906 additions and 906 deletions.
diff --git a/tests/setup/config.php b/tests/setup/config.php
@@ -1,5 +1,5 @@
 <?php
-define('VERSION', '2.0.3.1_rc');
+define('VERSION', '2.1.0.2_rc');
 define('ADMIN_USERNAME', '');
 define('ADMIN_PASSWORD', '');
 
@@ -38,4 +38,4 @@
 			'google_sitemap_status' => 1
 		)
 	),
-);
+);
diff --git a/upload/admin/controller/analytics/google_analytics.php b/upload/admin/controller/analytics/google_analytics.php
@@ -3,7 +3,7 @@ class ControllerAnalyticsGoogleAnalytics extends Controller {
 	private $error = array();
 
 	public function index() {
-		$this->language->load('analytics/google_analytics');
+		$this->load->language('analytics/google_analytics');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 

diff --git a/upload/admin/controller/captcha/basic_captcha.php b/upload/admin/controller/captcha/basic_captcha.php
@@ -3,7 +3,7 @@ class ControllerCaptchaBasicCaptcha extends Controller {
 	private $error = array();
 
 	public function index() {
-		$this->language->load('captcha/basic_captcha');
+		$this->load->language('captcha/basic_captcha');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 

diff --git a/upload/admin/controller/captcha/google_captcha.php b/upload/admin/controller/captcha/google_captcha.php
@@ -3,7 +3,7 @@ class ControllerCaptchaGoogleCaptcha extends Controller {
 	private $error = array();
 
 	public function index() {
-		$this->language->load('captcha/google_captcha');
+		$this->load->language('captcha/google_captcha');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 

diff --git a/upload/admin/controller/catalog/attribute.php b/upload/admin/controller/catalog/attribute.php
@@ -3,7 +3,7 @@ class ControllerCatalogAttribute extends Controller {
 	private $error = array();
 
 	public function index() {
-		$this->language->load('catalog/attribute');
+		$this->load->language('catalog/attribute');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -13,7 +13,7 @@ public function index() {
 	}
 
 	public function add() {
-		$this->language->load('catalog/attribute');
+		$this->load->language('catalog/attribute');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -45,7 +45,7 @@ public function add() {
 	}
 
 	public function edit() {
-		$this->language->load('catalog/attribute');
+		$this->load->language('catalog/attribute');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -77,7 +77,7 @@ public function edit() {
 	}
 
 	public function delete() {
-		$this->language->load('catalog/attribute');
+		$this->load->language('catalog/attribute');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 

diff --git a/upload/admin/controller/catalog/attribute_group.php b/upload/admin/controller/catalog/attribute_group.php
@@ -3,7 +3,7 @@ class ControllerCatalogAttributeGroup extends Controller {
 	private $error = array();
 
 	public function index() {
-		$this->language->load('catalog/attribute_group');
+		$this->load->language('catalog/attribute_group');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -13,7 +13,7 @@ public function index() {
 	}
 
 	public function add() {
-		$this->language->load('catalog/attribute_group');
+		$this->load->language('catalog/attribute_group');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -45,7 +45,7 @@ public function add() {
 	}
 
 	public function edit() {
-		$this->language->load('catalog/attribute_group');
+		$this->load->language('catalog/attribute_group');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -77,7 +77,7 @@ public function edit() {
 	}
 
 	public function delete() {
-		$this->language->load('catalog/attribute_group');
+		$this->load->language('catalog/attribute_group');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 

diff --git a/upload/admin/controller/catalog/category.php b/upload/admin/controller/catalog/category.php
@@ -3,7 +3,7 @@ class ControllerCatalogCategory extends Controller {
 	private $error = array();
 
 	public function index() {
-		$this->language->load('catalog/category');
+		$this->load->language('catalog/category');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -13,7 +13,7 @@ public function index() {
 	}
 
 	public function add() {
-		$this->language->load('catalog/category');
+		$this->load->language('catalog/category');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -45,7 +45,7 @@ public function add() {
 	}
 
 	public function edit() {
-		$this->language->load('catalog/category');
+		$this->load->language('catalog/category');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -77,7 +77,7 @@ public function edit() {
 	}
 
 	public function delete() {
-		$this->language->load('catalog/category');
+		$this->load->language('catalog/category');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -111,7 +111,7 @@ public function delete() {
 	}
 
 	public function repair() {
-		$this->language->load('catalog/category');
+		$this->load->language('catalog/category');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 

diff --git a/upload/admin/controller/catalog/download.php b/upload/admin/controller/catalog/download.php
@@ -3,7 +3,7 @@ class ControllerCatalogDownload extends Controller {
 	private $error = array();
 
 	public function index() {
-		$this->language->load('catalog/download');
+		$this->load->language('catalog/download');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -13,7 +13,7 @@ public function index() {
 	}
 
 	public function add() {
-		$this->language->load('catalog/download');
+		$this->load->language('catalog/download');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -45,7 +45,7 @@ public function add() {
 	}
 
 	public function edit() {
-		$this->language->load('catalog/download');
+		$this->load->language('catalog/download');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -77,7 +77,7 @@ public function edit() {
 	}
 
 	public function delete() {
-		$this->language->load('catalog/download');
+		$this->load->language('catalog/download');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -426,7 +426,7 @@ protected function validateDelete() {
 	}
 
 	public function upload() {
-		$this->language->load('catalog/download');
+		$this->load->language('catalog/download');
 
 		$json = array();
 

diff --git a/upload/admin/controller/catalog/filter.php b/upload/admin/controller/catalog/filter.php
@@ -3,7 +3,7 @@ class ControllerCatalogFilter extends Controller {
 	private $error = array();
 
 	public function index() {
-		$this->language->load('catalog/filter');
+		$this->load->language('catalog/filter');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -13,7 +13,7 @@ public function index() {
 	}
 
 	public function add() {
-		$this->language->load('catalog/filter');
+		$this->load->language('catalog/filter');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -45,7 +45,7 @@ public function add() {
 	}
 
 	public function edit() {
-		$this->language->load('catalog/filter');
+		$this->load->language('catalog/filter');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -77,7 +77,7 @@ public function edit() {
 	}
 
 	public function delete() {
-		$this->language->load('catalog/filter');
+		$this->load->language('catalog/filter');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 

diff --git a/upload/admin/controller/catalog/information.php b/upload/admin/controller/catalog/information.php
@@ -3,7 +3,7 @@ class ControllerCatalogInformation extends Controller {
 	private $error = array();
 
 	public function index() {
-		$this->language->load('catalog/information');
+		$this->load->language('catalog/information');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -13,7 +13,7 @@ public function index() {
 	}
 
 	public function add() {
-		$this->language->load('catalog/information');
+		$this->load->language('catalog/information');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -45,7 +45,7 @@ public function add() {
 	}
 
 	public function edit() {
-		$this->language->load('catalog/information');
+		$this->load->language('catalog/information');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -77,7 +77,7 @@ public function edit() {
 	}
 
 	public function delete() {
-		$this->language->load('catalog/information');
+		$this->load->language('catalog/information');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 

diff --git a/upload/admin/controller/catalog/manufacturer.php b/upload/admin/controller/catalog/manufacturer.php
@@ -3,7 +3,7 @@ class ControllerCatalogManufacturer extends Controller {
 	private $error = array();
 
 	public function index() {
-		$this->language->load('catalog/manufacturer');
+		$this->load->language('catalog/manufacturer');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -13,7 +13,7 @@ public function index() {
 	}
 
 	public function add() {
-		$this->language->load('catalog/manufacturer');
+		$this->load->language('catalog/manufacturer');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -45,7 +45,7 @@ public function add() {
 	}
 
 	public function edit() {
-		$this->language->load('catalog/manufacturer');
+		$this->load->language('catalog/manufacturer');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -77,7 +77,7 @@ public function edit() {
 	}
 
 	public function delete() {
-		$this->language->load('catalog/manufacturer');
+		$this->load->language('catalog/manufacturer');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 

diff --git a/upload/admin/controller/catalog/option.php b/upload/admin/controller/catalog/option.php
@@ -3,7 +3,7 @@ class ControllerCatalogOption extends Controller {
 	private $error = array();
 
 	public function index() {
-		$this->language->load('catalog/option');
+		$this->load->language('catalog/option');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -13,7 +13,7 @@ public function index() {
 	}
 
 	public function add() {
-		$this->language->load('catalog/option');
+		$this->load->language('catalog/option');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -45,7 +45,7 @@ public function add() {
 	}
 
 	public function edit() {
-		$this->language->load('catalog/option');
+		$this->load->language('catalog/option');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -77,7 +77,7 @@ public function edit() {
 	}
 
 	public function delete() {
-		$this->language->load('catalog/option');
+		$this->load->language('catalog/option');
 
 		$this->document->setTitle($this->language->get('heading_title'));
 
@@ -462,7 +462,7 @@ public function autocomplete() {
 		$json = array();
 
 		if (isset($this->request->get['filter_name'])) {
-			$this->language->load('catalog/option');
+			$this->load->language('catalog/option');
 
 			$this->load->model('catalog/option');