aboutsummaryrefslogtreecommitdiffstats
path: root/include/account.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-06-01 09:15:56 +0200
committerMario Vavti <mario@mariovavti.com>2016-06-01 09:15:56 +0200
commitc1039977f1d64611d2c793f3aded96d031b74183 (patch)
treefa32a8f59c863564998cd149a902388dd363d605 /include/account.php
parent316fee93f7f7df92db514de961b74a71556fdb63 (diff)
parentb1259876bf398880e7b0c1b44d90f94983243e72 (diff)
downloadvolse-hubzilla-c1039977f1d64611d2c793f3aded96d031b74183.tar.gz
volse-hubzilla-c1039977f1d64611d2c793f3aded96d031b74183.tar.bz2
volse-hubzilla-c1039977f1d64611d2c793f3aded96d031b74183.zip
Merge branch 'dev' into sabre32
Diffstat (limited to 'include/account.php')
-rw-r--r--include/account.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/account.php b/include/account.php
index a442f3073..caf12878e 100644
--- a/include/account.php
+++ b/include/account.php
@@ -229,7 +229,7 @@ function verify_email_address($arr) {
$hash = random_string();
- $r = q("INSERT INTO register ( hash, created, uid, password, language ) VALUES ( '%s', '%s', %d, '%s', '%s' ) ",
+ $r = q("INSERT INTO register ( hash, created, uid, password, lang ) VALUES ( '%s', '%s', %d, '%s', '%s' ) ",
dbesc($hash),
dbesc(datetime_convert()),
intval($arr['account']['account_id']),
@@ -283,7 +283,7 @@ function send_reg_approval_email($arr) {
$hash = random_string();
- $r = q("INSERT INTO register ( hash, created, uid, password, language ) VALUES ( '%s', '%s', %d, '%s', '%s' ) ",
+ $r = q("INSERT INTO register ( hash, created, uid, password, lang ) VALUES ( '%s', '%s', %d, '%s', '%s' ) ",
dbesc($hash),
dbesc(datetime_convert()),
intval($arr['account']['account_id']),
@@ -387,7 +387,7 @@ function account_allow($hash) {
intval($register[0]['uid'])
);
- push_lang($register[0]['language']);
+ push_lang($register[0]['lang']);
$email_tpl = get_intltext_template("register_open_eml.tpl");
$email_tpl = replace_macros($email_tpl, array(