Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

master branche updates #1

Merged
merged 8 commits into from
Nov 5, 2015
+906 −906
Merged

master branche updates #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
52b4c13
Updated version
vivekkiran Oct 31, 2015
45f5ce8
The Comparision Condition was placed wronglyl
Nov 1, 2015
6cd0fa6
langage->load to load->langage
danielkerr Nov 2, 2015
f8deffd
Merge pull request #3583 from profitlanding/master
danielkerr Nov 3, 2015
1b59847
Merge pull request #3579 from vivekkiran/patch-6
danielkerr Nov 3, 2015
5c4e325
Merge pull request #3582 from sharanhayer/patch-1
danielkerr Nov 3, 2015
70a451c
Incorrect Comparision condition
Nov 3, 2015
76a772f
Merge pull request #3588 from sharanhayer/patch-2
danielkerr Nov 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions tests/setup/config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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', '');

Expand Down Expand Up @@ -38,4 +38,4 @@
'google_sitemap_status' => 1
)
),
);
);
2 changes: 1 addition & 1 deletion upload/admin/controller/analytics/google_analytics.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'));

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/captcha/basic_captcha.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'));

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/captcha/google_captcha.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'));

Expand Down
8 changes: 4 additions & 4 deletions upload/admin/controller/catalog/attribute.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'));

Expand All @@ -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'));

Expand Down Expand Up @@ -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'));

Expand Down Expand Up @@ -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'));

Expand Down
8 changes: 4 additions & 4 deletions upload/admin/controller/catalog/attribute_group.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'));

Expand All @@ -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'));

Expand Down Expand Up @@ -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'));

Expand Down Expand Up @@ -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'));

Expand Down
10 changes: 5 additions & 5 deletions upload/admin/controller/catalog/category.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'));

Expand All @@ -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'));

Expand Down Expand Up @@ -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'));

Expand Down Expand Up @@ -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'));

Expand Down Expand Up @@ -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'));

Expand Down
10 changes: 5 additions & 5 deletions upload/admin/controller/catalog/download.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'));

Expand All @@ -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'));

Expand Down Expand Up @@ -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'));

Expand Down Expand Up @@ -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'));

Expand Down Expand Up @@ -426,7 +426,7 @@ protected function validateDelete() {
}

public function upload() {
$this->language->load('catalog/download');
$this->load->language('catalog/download');

$json = array();

Expand Down
8 changes: 4 additions & 4 deletions upload/admin/controller/catalog/filter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'));

Expand All @@ -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'));

Expand Down Expand Up @@ -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'));

Expand Down Expand Up @@ -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'));

Expand Down
8 changes: 4 additions & 4 deletions upload/admin/controller/catalog/information.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'));

Expand All @@ -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'));

Expand Down Expand Up @@ -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'));

Expand Down Expand Up @@ -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'));

Expand Down
8 changes: 4 additions & 4 deletions upload/admin/controller/catalog/manufacturer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'));

Expand All @@ -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'));

Expand Down Expand Up @@ -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'));

Expand Down Expand Up @@ -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'));

Expand Down
10 changes: 5 additions & 5 deletions upload/admin/controller/catalog/option.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'));

Expand All @@ -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'));

Expand Down Expand Up @@ -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'));

Expand Down Expand Up @@ -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'));

Expand Down Expand Up @@ -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');

Expand Down
Loading