Permalink
Browse files

Remove more deprecations

  • Loading branch information...
1 parent 7ee1084 commit 0feba8dab30f7ecf2b7fe2b8d08fee16f5220b1f @dereuromark dereuromark committed Jan 8, 2014
Showing with 3 additions and 7 deletions.
  1. +1 −4 Cake/Console/Command/CommandListShell.php
  2. +2 −3 Cake/I18n/L10n.php
@@ -131,10 +131,7 @@ public function getOptionParser() {
$parser->description(
__d('cake_console', 'Get the list of available shells for this CakePHP application.')
- )->addOption('sort', [
- 'help' => __d('cake_console', 'Does nothing (deprecated)'),
- 'boolean' => true
- ])->addOption('xml', [
+ )->addOption('xml', [
'help' => __d('cake_console', 'Get the listing as XML.'),
'boolean' => true
]);
View
@@ -57,8 +57,7 @@ class L10n {
* Default language.
*
* If config value 'Config.language' is set in an application this will be set
- * as a fall back else if DEFAULT_LANGUAGE it defined it will be used.
- * Constant DEFAULT_LANGUAGE has been deprecated in 2.4
+ * as a fall back.
*
* @var string
*/
@@ -349,7 +348,7 @@ public function __construct(Request $request) {
* If $language is null it attempt to get settings from L10n::_autoLanguage(); if this fails
* the method will get the settings from L10n::_setLanguage();
*
- * @param string $language Language (if null will use DEFAULT_LANGUAGE if defined)
+ * @param string $language Language (if null will use config value 'Config.language' if set)
* @return mixed
*/
public function get($language = null) {

0 comments on commit 0feba8d

Please sign in to comment.