Skip to content

Commit

Permalink
Merge branch 'staging' into 3.8-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
wilsonge committed Feb 17, 2017
2 parents 5d8b07f + 8489e45 commit fe4a572
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions bin/keychain.php
Expand Up @@ -47,15 +47,6 @@
error_reporting(E_ALL);
ini_set('display_errors', 1);

// Load Library language
$lang = JFactory::getLanguage();

// Try the finder_cli file in the current language (without allowing the loading of the file in the default language)
$lang->load('finder_cli', JPATH_SITE, null, false, false)

// Fallback to the finder_cli file in the default language
|| $lang->load('finder_cli', JPATH_SITE, null, true);

/**
* Keychain Manager.
*
Expand Down

0 comments on commit fe4a572

Please sign in to comment.