Merge branch 'pull'

[friendica.git] / mod / events.php

diff --git a/mod/events.php b/mod/events.php
index 27ca698307852a941b93eae88c2affe1766c29d4..fb68d53dbc020593ca5cdd282a85735af0a165f6 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -45,13 +45,20 @@ function events_post(&$a) {
                        $finish = datetime_convert('UTC','UTC',$finish);
        }
 
+       // Don't allow the event to finish before it begins.
+       // It won't hurt anything, but somebody will file a bug report
+       // and we'll waste a bunch of time responding to it. Time that 
+       // could've been spent doing something else. 
+
+       if(strcmp($finish,$start) < 0)
+               $finish = $start;
 
        $desc     = escape_tags(trim($_POST['desc']));
        $location = escape_tags(trim($_POST['location']));
        $type     = 'event';
 
        if((! $desc) || (! $start)) {
-               notice('Event description and start time are required.');
+               notice( t('Event description and start time are required.') . EOL);
                goaway($a->get_baseurl() . '/events/new');
        }
 
@@ -105,17 +112,7 @@ function events_content(&$a) {
 
        $o ="";
        // tabs
-       $tpl = get_markup_template('profile_tabs.tpl');
-       $o .= replace_macros($tpl,array(
-               '$url' => $a->get_baseurl() . '/profile/' . $a->user['nickname'],
-               '$phototab' => $a->get_baseurl() . '/photos/' . $a->user['nickname'],
-               '$status' => t('Status'),
-               '$profile' => t('Profile'),
-               '$photos' => t('Photos'),
-               '$events' => t('Events') ,
-               '$notes' => t('Personal Notes'),
-               '$activetab' => "events",
-       ));     
+       $o .= profile_tabs($a, True);   
 
        $o .= '<h2>' . t('Events') . '</h2>';