From e5306ee5d0f03a87187dc274a83c56b49ac672b7 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 17 Feb 2012 02:29:32 -0500
Subject: [PATCH] - Fix date_today, broken in r5707

---
 program/include/main.inc |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/program/include/main.inc b/program/include/main.inc
index 8b935c1..1e84e2d 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -790,6 +790,7 @@
 
   // define date format depending on current time
   if (!$format) {
+    $now         = time();
     $now_date    = getdate($now);
     $today_limit = mktime(0, 0, 0, $now_date['mon'], $now_date['mday'], $now_date['year']);
     $week_limit  = mktime(0, 0, 0, $now_date['mon'], $now_date['mday']-6, $now_date['year']);
@@ -1379,8 +1380,8 @@
   $RCMAIL->output->add_script(sprintf("rcmail_editor_init(%s)",
     json_encode(array(
         'mode'       => $mode,
-        'skin_path'  => '$__skin_path',
         'lang'       => $lang,
+        'skin_path'  => $RCMAIL->output->get_skin_path(),
         'spellcheck' => intval($RCMAIL->config->get('enable_spellcheck')),
         'spelldict'  => intval($RCMAIL->config->get('spellcheck_dictionary')),
     ))), 'foot');

--
Gitblit v1.9.1