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.

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

Move mobile detect to composer #6100

Merged
merged 1 commit into from Sep 2, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions classes/Context.php
Expand Up @@ -78,7 +78,7 @@ class ContextCore
/** @var Smarty */
public $smarty;

/** @var Mobile_Detect */
/** @var \Mobile_Detect */
public $mobile_detect;

/** @var int */
Expand Down Expand Up @@ -124,14 +124,14 @@ class ContextCore
/**
* Sets Mobile_Detect tool object
*
* @return Mobile_Detect
* @return \Mobile_Detect
*/
public function getMobileDetect()
{
if ($this->mobile_detect === null) {
require_once(_PS_TOOL_DIR_.'mobile_Detect/Mobile_Detect.php');
$this->mobile_detect = new Mobile_Detect();
$this->mobile_detect = new \Mobile_Detect();
}

return $this->mobile_detect;
}

Expand Down
1 change: 1 addition & 0 deletions composer.json
Expand Up @@ -13,6 +13,7 @@
"doctrine/doctrine-bundle": "1.5.2",
"mrclay/minify": "~2.3.0",
"jakeasmith/http_build_url": "^1",
"mobiledetect/mobiledetectlib": "~2.8.22",
"symfony/swiftmailer-bundle": "2.3.11",
"pear/archive_tar": "~1.4.2",
"swiftmailer/swiftmailer": "~5.4.3",
Expand Down
14 changes: 0 additions & 14 deletions docs/licences/Mobile_detect.txt

This file was deleted.

2 changes: 0 additions & 2 deletions tools/mobile_Detect/.htaccess

This file was deleted.

48 changes: 0 additions & 48 deletions tools/mobile_Detect/LICENSE

This file was deleted.