summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/db-prefs.php8
-rw-r--r--include/functions.php9
2 files changed, 8 insertions, 9 deletions
diff --git a/include/db-prefs.php b/include/db-prefs.php
deleted file mode 100644
index ce5753638..000000000
--- a/include/db-prefs.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
- function get_pref($pref_name, $user_id = false, $die_on_error = false) {
- return Db_Prefs::get()->read($pref_name, $user_id, $die_on_error);
- }
-
- function set_pref($pref_name, $value, $user_id = false, $strip_tags = true) {
- return Db_Prefs::get()->write($pref_name, $value, $user_id, $strip_tags);
- } \ No newline at end of file
diff --git a/include/functions.php b/include/functions.php
index 172ba169d..a698fa79d 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -42,6 +42,14 @@
define('SUBSTRING_FOR_DATE', 'SUBSTRING');
}
+ function get_pref($pref_name, $user_id = false, $die_on_error = false) {
+ return Db_Prefs::get()->read($pref_name, $user_id, $die_on_error);
+ }
+
+ function set_pref($pref_name, $value, $user_id = false, $strip_tags = true) {
+ return Db_Prefs::get()->write($pref_name, $value, $user_id, $strip_tags);
+ }
+
function get_translations() {
$t = array(
"auto" => __("Detect automatically"),
@@ -152,7 +160,6 @@
}
}
- require_once 'db-prefs.php';
require_once 'controls.php';
require_once 'controls_compat.php';