update translations (ru_RU)

[tt-rss.git] / db-prefs.php

diff --git a/db-prefs.php b/db-prefs.php
index a33dee80dfc05fa7f778cd7483b8a8f261c81cd8..f9b57e6b11e9b863b3f6552c11223320b920738e 100644 (file)
--- a/db-prefs.php
+++ b/db-prefs.php
@@ -1,4 +1,4 @@
-<?
+<?php
        require_once "config.php";
        require_once "db.php";
 
@@ -7,9 +7,10 @@
                        $_SESSION["prefs_cache"] = array();
        }
 
-       function get_pref($link, $pref_name, $user_id = false) {
+       function get_pref($link, $pref_name, $user_id = false, $die_on_error = false) {
 
                $pref_name = db_escape_string($pref_name);
+               $prefs_cache = true;
 
                if (!$user_id) {
                        $user_id = $_SESSION["uid"];
@@ -18,7 +19,7 @@
                        $prefs_cache = false;
                }
 
-               if (!defined('DISABLE_SESSIONS') && !SINGLE_USER_MODE) {        
+               if ($prefs_cache && !defined('DISABLE_SESSIONS') && !SINGLE_USER_MODE) {        
                        if ($_SESSION["prefs_cache"] && $_SESSION["prefs_cache"][$pref_name]) {
                                $tuple = $_SESSION["prefs_cache"][$pref_name];
                                return convert_pref_type($tuple["value"], $tuple["type"]);
@@ -49,7 +50,11 @@
                        return convert_pref_type($value, $type_name);
                        
                } else {                
-                       die("Fatal error, unknown preferences key: $pref_name");                        
+                       if ($die_on_error) {
+                               die("Fatal error, unknown preferences key: $pref_name");
+                       } else {
+                               return null;
+                       }
                }
        }