Commit a2dc8a91 authored by kpaxman's avatar kpaxman
Browse files

Create 1.28.2 from trunk

parent e5612f46
......@@ -3,7 +3,7 @@ description = Adds events and event listing pages.
core = 7.x
package = uWaterloo Content Types
php = 5.2.4
version = 7.x-1.28.1
version = 7.x-1.28.2
project = uw_ct_event
dependencies[] = better_formats
dependencies[] = calendar
......
......@@ -703,8 +703,7 @@ function uw_ct_event_theme($existing, $type, $theme, $path) {
* custom html block: To add the feed link to a block
*/
function events_public_feed_link() {
global $base_path;
$basepath = $base_path . 'events/events.xml';
$basepath = base_path() . 'events/events.xml';
return '<div class="rss_link"><a href="' . $basepath . '">Subscribe to events feed</a></div>';
}
......@@ -812,7 +811,6 @@ function uw_ct_event_preprocess_html(&$variables) {
function uw_ct_event_audience_taxonomy_tree($tid) {
$today = date("Y-m-d");
$taxonomy = uw_ct_event_audience_get_taxonomy_parents($tid, $today);
global $base_path;
if ($taxonomy) {
$html = '<ul>';
foreach ($taxonomy as $id => $item) {
......@@ -1416,8 +1414,7 @@ function uw_ct_event_get_combine_month_array($month_date_value, $month_date_valu
function uw_ct_event_workbench_moderation_transition($node, $previous_state, $new_state) {
global $base_root;
$path = base_path();
$path = trim($path, '/');
$path = trim(base_path(), '/');
if($node->type == 'uw_event' && $base_root == 'https://uwaterloo.ca') {
if($node->workbench_moderation['current']->current == TRUE && $node->workbench_moderation['current']->published == TRUE) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment