summaryrefslogtreecommitdiff
path: root/modules/gallery/helpers
diff options
context:
space:
mode:
Diffstat (limited to 'modules/gallery/helpers')
-rw-r--r--modules/gallery/helpers/l10n_client.php9
-rw-r--r--modules/gallery/helpers/l10n_scanner.php4
2 files changed, 6 insertions, 7 deletions
diff --git a/modules/gallery/helpers/l10n_client.php b/modules/gallery/helpers/l10n_client.php
index 14ab5a85..fe70933d 100644
--- a/modules/gallery/helpers/l10n_client.php
+++ b/modules/gallery/helpers/l10n_client.php
@@ -80,11 +80,10 @@ class l10n_client_Core {
}
// @todo Batch requests (max request size)
- foreach (Database::instance()
+ foreach (db::build()
->select("key", "locale", "revision", "translation")
->from("incoming_translations")
- ->get()
- ->as_array() as $row) {
+ ->execute() as $row) {
if (!isset($request->messages->{$row->key})) {
$request->messages->{$row->key} = 1;
}
@@ -168,10 +167,10 @@ class l10n_client_Core {
// @todo Batch requests (max request size)
// @todo include base_revision in submission / how to handle resubmissions / edit fights?
- foreach (Database::instance()
+ foreach (db::build()
->select("key", "message", "locale", "base_revision", "translation")
->from("outgoing_translations")
- ->get() as $row) {
+ ->execute() as $row) {
$key = $row->key;
if (!isset($request->{$key})) {
$request->{$key}->message = json_encode(unserialize($row->message));
diff --git a/modules/gallery/helpers/l10n_scanner.php b/modules/gallery/helpers/l10n_scanner.php
index a7ce2c59..d76c4d19 100644
--- a/modules/gallery/helpers/l10n_scanner.php
+++ b/modules/gallery/helpers/l10n_scanner.php
@@ -28,11 +28,11 @@ class l10n_scanner_Core {
static function process_message($message, &$cache) {
if (empty($cache)) {
- foreach (Database::instance()
+ foreach (db::build()
->select("key")
->from("incoming_translations")
->where("locale", "=", "root")
- ->get() as $row) {
+ ->execute() as $row) {
$cache[$row->key] = true;
}
}