diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-12-17 21:41:33 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-12-17 21:41:33 +0100 |
| commit | 0b898678003b154fde1abd57da27e9246606085f (patch) | |
| tree | 87e7c5575cc9a269b3807a58499db52854d48e47 /app/Models/UserDAO.php | |
| parent | 930026df2159b027bc035f4ed15c39a43eb0e9fe (diff) | |
| parent | 875b8a72f97429c4e4df6d292daf4261fb7a45bd (diff) | |
Merge branch 'dev' into 252-extensions
Conflicts:
app/i18n/en/admin.php
app/i18n/en/feedback.php
app/i18n/en/gen.php
app/i18n/fr/admin.php
app/i18n/fr/feedback.php
app/i18n/fr/gen.php
app/views/index/normal.phtml
Diffstat (limited to 'app/Models/UserDAO.php')
| -rw-r--r-- | app/Models/UserDAO.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/Models/UserDAO.php b/app/Models/UserDAO.php index 60fca71b1..f04ae26bf 100644 --- a/app/Models/UserDAO.php +++ b/app/Models/UserDAO.php @@ -9,7 +9,7 @@ class FreshRSS_UserDAO extends Minz_ModelPdo { $ok = false; if (defined('SQL_CREATE_TABLES')) { //E.g. MySQL - $sql = sprintf(SQL_CREATE_TABLES, $db['prefix'] . $username . '_', _t('default_category')); + $sql = sprintf(SQL_CREATE_TABLES, $db['prefix'] . $username . '_', _t('gen.short.default_category')); $stm = $userPDO->bd->prepare($sql); $ok = $stm && $stm->execute(); } else { //E.g. SQLite @@ -17,7 +17,7 @@ class FreshRSS_UserDAO extends Minz_ModelPdo { if (is_array($SQL_CREATE_TABLES)) { $ok = true; foreach ($SQL_CREATE_TABLES as $instruction) { - $sql = sprintf($instruction, '', _t('default_category')); + $sql = sprintf($instruction, '', _t('gen.short.default_category')); $stm = $userPDO->bd->prepare($sql); $ok &= ($stm && $stm->execute()); } |