Changeset 667614

Timestamp:

02/13/2013 08:51:51 PM (11 years ago)

Author:

stephenh1988

Message:

Committing 1.7.3 - template bug fixes & minor bugs

Location:

event-organiser/trunk

Files:

• event-organiser-settings.php (modified) (6 diffs)
• event-organiser.php (modified) (2 diffs)
• includes/event-organiser-event-functions.php (modified) (1 diff)
• includes/event-organiser-templates.php (modified) (1 diff)
• readme.md (modified) (2 diffs)
• readme.txt (modified) (2 diffs)

event-organiser/trunk/event-organiser-settings.php

@@ -219 +219 @@
                 ) );
 
-                $site_url = site_url();
+                $e_url();
                 add_settings_field( 'url_event', __("Event (single)", 'eventorganiser' ), 'eventorganiser_text_field' , 'eventorganiser_'.$tab_id, $tab_id,
                     array(
@@ -225 +225 @@
                         'name' => 'eventorganiser_options[url_event]',
                         'value' => eventorganiser_get_option( 'url_event' ),
-                        'help' => "<code>{$site_url}/<strong>".eventorganiser_get_option( 'url_event' )."</strong>/[event_slug]</code>"
+                        'help' => "<code>{$e_url}/<strong>".eventorganiser_get_option( 'url_event' )."</strong>/[event_slug]</code>"
                 ) );
 
@@ -234 +234 @@
                         'name' => 'eventorganiser_options[url_events]',
                         'value' => eventorganiser_get_option( 'url_events' ),
-                        'help' => "<code>{$site_url}/<strong>".eventorganiser_get_option( 'url_events' )."</strong></code>".'<br>'
-                                  ."<code>{$site_url}/<strong>".eventorganiser_get_option( 'url_events' )."</strong>/on/{$now->format('Y')}</code> ".__('Year archive', 'eventorganiser').'<br>'
-                                  ."<code>{$site_url}/<strong>".eventorganiser_get_option( 'url_events' )."</strong>/on/{$now->format('Y/m')}</code>".__('Month archive', 'eventorganiser').'<br>'
-                                  ."<code>{$site_url}/<strong>".eventorganiser_get_option( 'url_events' )."</strong>/on/{$now->format('Y/m/d')}</code>".__('Day archive', 'eventorganiser')
+                        'help' => "<code>{$e_url}/<strong>".eventorganiser_get_option( 'url_events' )."</strong></code>".'<br>'
+                                  ."<code>{$e_url}/<strong>".eventorganiser_get_option( 'url_events' )."</strong>/on/{$now->format('Y')}</code> ".__('Year archive', 'eventorganiser').'<br>'
+                                  ."<code>{$e_url}/<strong>".eventorganiser_get_option( 'url_events' )."</strong>/on/{$now->format('Y/m')}</code>".__('Month archive', 'eventorganiser').'<br>'
+                                  ."<code>{$e_url}/<strong>".eventorganiser_get_option( 'url_events' )."</strong>/on/{$now->format('Y/m/d')}</code>".__('Day archive', 'eventorganiser')
                 ) );
     
@@ -245 +245 @@
                         'name' => 'eventorganiser_options[url_venue]',
                         'value' => eventorganiser_get_option( 'url_venue' ),
-                        'help' => "<code>{$site_url}/<strong>".eventorganiser_get_option( 'url_venue' )."</strong>/[venue_slug]</code>"
+                        'help' => "<code>{$e_url}/<strong>".eventorganiser_get_option( 'url_venue' )."</strong>/[venue_slug]</code>"
                 ) );
 
@@ -253 +253 @@
                         'name' => 'eventorganiser_options[url_cat]',
                         'value' => eventorganiser_get_option( 'url_cat' ),
-                        'help' => "<code>{$site_url}/<strong>".eventorganiser_get_option( 'url_cat' )."</strong>/[event_cat_slug]</code>"
+                        'help' => "<code>{$e_url}/<strong>".eventorganiser_get_option( 'url_cat' )."</strong>/[event_cat_slug]</code>"
                 ) );
 
@@ -261 +261 @@
                         'name' => 'eventorganiser_options[url_tag]',
                         'value' => eventorganiser_get_option( 'url_tag' ),
-                        'help' => "<label><code>{$site_url}/<strong>".eventorganiser_get_option( 'url_tag' )."</strong>/[event_tag_slug]</code></label>"
+                        'help' => "<label><code>{$e_url}/<strong>".eventorganiser_get_option( 'url_tag' )."</strong>/[event_tag_slug]</code></label>"
                 ) );
 

event-organiser/trunk/event-organiser.php

@@ -3 +3 @@
 Plugin Name: Event Organiser
 Plugin URI: http://www.wp-event-organiser.com
-Version: 1.7.2
+Version: 1.7.
 Description: Creates a custom post type 'events' with features such as reoccurring events, venues, Google Maps, calendar views and events and venue pages
 Author: Stephen Harris
@@ -42 +42 @@
  */ 
 global $eventorganiser_db_version;
-$eventorganiser_db_version = '1.7.2';
+$eventorganiser_db_version = '1.7.';
 
 /**

event-organiser/trunk/includes/event-organiser-event-functions.php

@@ -1056 +1056 @@
     }
 
-    if( get_the_terms(get_the_ID(),'event-tag') ){
+    if( get_the_terms(get_the_ID(),'event-tag') ){
         $html .= sprintf('<li><strong>%s:</strong> %s</li>',
                             __('Tags','eventorganiser'),

event-organiser/trunk/includes/event-organiser-templates.php

@@ -227 +227 @@
      * add content in via the_content
     */
-    if( is_singular('event') && !eventorganiser_is_event_template($template,'single') ){    
+    if( is_singular('event') && !eventorganiser_is_event_template($template,'') ){ 
         //Viewing a single event
-
+        
         //Hide next/previous post link
         add_filter("next_post_link",'__return_false');

event-organiser/trunk/readme.md

@@ -5 +5 @@
 **Requires at least:** 3.3  
 **Tested up to:** 3.5  
-**Stable tag:** 1.7.2
+**Stable tag:** 1.7.
 **License:** GPLv3  
 
@@ -175 +175 @@
 ## Changelog ##
 
+
+
+
+
+
 ### 1.7.2 ###
 * Fixes template bug introduced in 1.7.1

event-organiser/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.3
 Tested up to: 3.5
-Stable tag: 1.7.2
+Stable tag: 1.7.
 License: GPLv3
 
@@ -163 +163 @@
 == Changelog ==
 
+
+
+
+
+
 = 1.7.2 =
 * Fixes template bug introduced in 1.7.1