From 1e3285855038fdee5804532ba995dcce195b0b9c Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Thu, 30 Sep 2010 12:12:12 +0000
Subject: [PATCH] 2010-09-30 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_db.php: in function "checklogin" fixed the include of
file "user.class.php". In function "__" fixed when try translate a empty
string.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3329 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
pandora_console/ChangeLog | 8 +++++++-
pandora_console/include/functions_db.php | 6 +++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 91d94c8e1c..17dc55998d 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,4 +1,10 @@
-2010-09-29 Miguel de Dios <miguel.dedios@artica.es>
+2010-09-30 Miguel de Dios <miguel.dedios@artica.es>
+
+ * include/functions_db.php: in function "checklogin" fixed the include of
+ file "user.class.php". In function "__" fixed when try translate a empty
+ string.
+
+2010-09-30 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_db.php: erased deprecate function "comprueba_login".
diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php
index b82dd4d060..44971ee1df 100644
--- a/pandora_console/include/functions_db.php
+++ b/pandora_console/include/functions_db.php
@@ -47,7 +47,7 @@ function check_login () {
}
}
else {
- require_once('../mobile/include/user.class.php');
+ require_once($config["homedir"].'/mobile/include/user.class.php');
session_start ();
session_write_close ();
$user = $_SESSION['user'];
@@ -2955,6 +2955,10 @@ echo __('Hello, %s!', $user);
function __ ($string /*, variable arguments */) {
global $l10n;
+ if ($string == '') {
+ return $string;
+ }
+
if (func_num_args () == 1) {
if (is_null ($l10n))
return $string;