Removed obsolete $ in source files
This commit is contained in:
parent
a39c010e06
commit
e5f2b64d98
146 changed files with 836 additions and 1081 deletions
|
@ -1,5 +1,4 @@
|
|||
<?php
|
||||
//$Id: calendar.inc,v 1.1.2.46 2010/11/28 23:31:28 karens Exp $
|
||||
/**
|
||||
* Build calendar
|
||||
*
|
||||
|
@ -23,10 +22,10 @@ function calendar_build_calendar($view, $items) {
|
|||
}
|
||||
$items = $values;
|
||||
ksort($items);
|
||||
|
||||
|
||||
$rows = array();
|
||||
$curday = drupal_clone($view->date_info->min_date);
|
||||
|
||||
|
||||
switch ($view->date_info->granularity) {
|
||||
case 'year':
|
||||
$rows = array();
|
||||
|
@ -53,7 +52,7 @@ function calendar_build_calendar($view, $items) {
|
|||
break;
|
||||
}
|
||||
return $rows;
|
||||
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -90,7 +89,7 @@ function calendar_build_week(&$curday, $view, $items, $check_month = FALSE) {
|
|||
$day_wday = date_format($curday, 'w');
|
||||
date_modify($curday, '-' . strval((7 + $day_wday - $first_day) % 7) . ' days');
|
||||
$curday_date = date_format($curday, DATE_FORMAT_DATE);
|
||||
|
||||
|
||||
// If we're displaying the week number, add it as the
|
||||
// first cell in the week.
|
||||
if (!empty($view->date_info->style_with_weekno) && !in_array($view->date_info->granularity, array('day', 'week'))) {
|
||||
|
@ -98,27 +97,27 @@ function calendar_build_week(&$curday, $view, $items, $check_month = FALSE) {
|
|||
if (!empty($view->date_info->display_types['week'])) {
|
||||
$weekno = l($week, $url, array('query' => !empty($view->date_info->append) ? $view->date_info->append : ''));
|
||||
}
|
||||
else {
|
||||
else {
|
||||
// Do not link week numbers, if Week views are disabled.
|
||||
$weekno = $week;
|
||||
}
|
||||
$rows[$week][] = array(
|
||||
'data' => $weekno,
|
||||
'id' => $view->name . '-weekno-' . $curday_date,
|
||||
'id' => $view->name . '-weekno-' . $curday_date,
|
||||
'class' => 'week');
|
||||
}
|
||||
for ($i = 0; $i < 7; $i++) {
|
||||
$curday_date = date_format($curday, DATE_FORMAT_DATE);
|
||||
$curday_date = date_format($curday, DATE_FORMAT_DATE);
|
||||
$class = strtolower($weekdays[$i] .
|
||||
($view->date_info->mini ? ' mini' : ''));
|
||||
if ($check_month && ($curday_date < $view->date_info->min_date_date || $curday_date > $view->date_info->max_date_date || date_format($curday, 'n') != $month)) {
|
||||
$class .= ' empty';
|
||||
$content = array(
|
||||
'date' => '',
|
||||
'datebox' => '',
|
||||
'empty' => theme('calendar_empty_day', $curday_date, $view),
|
||||
'date' => '',
|
||||
'datebox' => '',
|
||||
'empty' => theme('calendar_empty_day', $curday_date, $view),
|
||||
'link' => '',
|
||||
'all_day' => array(),
|
||||
'all_day' => array(),
|
||||
'items' => array(),
|
||||
);
|
||||
}
|
||||
|
@ -129,7 +128,7 @@ function calendar_build_week(&$curday, $view, $items, $check_month = FALSE) {
|
|||
($curday_date > $today ? ' future' : '') .
|
||||
(empty($items[$curday_date]) ? ' has-no-events' : ' has-events');
|
||||
}
|
||||
|
||||
|
||||
$rows[$week][] = array(
|
||||
'data' => $content,
|
||||
'class' => $class, 'id' => $view->name . '-' . $curday_date);
|
||||
|
@ -189,10 +188,10 @@ function calendar_build_day($curday, $view, $items) {
|
|||
}
|
||||
$link = theme('calendar_'. $view->date_info->calendar_type .'_multiple_node', $curday_date, $count, $view, $types);
|
||||
}
|
||||
|
||||
|
||||
$content = array(
|
||||
'date' => $curday_date,
|
||||
'datebox' => theme('calendar_datebox', $curday_date, $view, $items, $selected),
|
||||
'date' => $curday_date,
|
||||
'datebox' => theme('calendar_datebox', $curday_date, $view, $items, $selected),
|
||||
'empty' => $empty,
|
||||
'link' => $link,
|
||||
'all_day' => $all_day,
|
||||
|
@ -200,4 +199,3 @@ function calendar_build_day($curday, $view, $items) {
|
|||
);
|
||||
return $content;
|
||||
}
|
||||
|
||||
|
|
Reference in a new issue