ソースを参照

update BaseEmail to camelBack

euromark 11 年 前
コミット
e4a16d6493

+ 1 - 1
Controller/Component/Auth/TinyAuthorize.php

@@ -211,7 +211,7 @@ class TinyAuthorize extends BaseAuthorize {
 		}
 		if (!is_array($availableRoles) || !is_array($iniArray)) {
 			trigger_error(__d('dev', 'Invalid Role Setup for TinyAuthorize (no roles found)'));
-			return false;
+			return array();
 		}
 
 		foreach ($iniArray as $key => $array) {

+ 17 - 3
Lib/Config/BaseEmailConfig.php

@@ -1,4 +1,18 @@
 <?php
+// Support BC (snake case config)
+if (!Configure::read('Mail.smtp_host')) {
+	Configure::write('Mail.smtpHost', Configure::read('Mail.smtp_host'));
+}
+if (!Configure::read('Mail.smtp_username')) {
+	Configure::write('Mail.smtpUsername', Configure::read('Mail.smtp_username'));
+}
+if (!Configure::read('Mail.smtp_password')) {
+	Configure::write('Mail.smtpPassword', Configure::read('Mail.smtp_password'));
+}
+
+/**
+ * BaseEmailConfig for APP/Config/email.php
+ */
 class BaseEmailConfig {
 
 	public $default = array(
@@ -35,13 +49,13 @@ class BaseEmailConfig {
 		}
 		if ($config = Configure::read('Mail')) {
 			if (!empty($config['smtp_host'])) {
-				$this->default['host'] = $config['smtp_host'];
+				$this->default['host'] = $config['smtpHost'];
 			}
 			if (!empty($config['smtp_username'])) {
-				$this->default['username'] = $config['smtp_username'];
+				$this->default['username'] = $config['smtpUsername'];
 			}
 			if (!empty($config['smtp_password'])) {
-				$this->default['password'] = $config['smtp_password'];
+				$this->default['password'] = $config['smtpPassword'];
 			}
 		}
 	}