Changeset 6284

Show
Ignore:
Timestamp:
08/12/06 08:02:33 (2 years ago)
Author:
GamerZ
Message:

Fixed E-Mail Popup Bug

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • wp-email/trunk/email/email.php

    r6276 r6284  
    369369function email_popup_form_header() { 
    370370      global $id; 
    371       if(is_page()) { 
    372             echo '<form action="'.get_settings('home').'/wp-content/plugins/email/wp-email-popup.php?page_id='.$id.'" method="post">'."\n"; 
    373             echo '<input type="hidden" name="page_id" value="'.$id.'" />'."\n"; 
    374       } else { 
    375             echo '<form action="'.get_settings('home').'/wp-content/plugins/email/wp-email-popup.php?p='.$id.'" method="post">'."\n"; 
    376             echo '<input type="hidden" name="p" value="'.$id.'" />'."\n"; 
     371      $using_permalink = get_settings('permalink_structure'); 
     372      $permalink = get_permalink(); 
     373      if(!empty($using_permalink)) { 
     374            if(is_page()) { 
     375                  echo '<form action="'.$permalink.'emailpopuppage/" method="post">'."\n"; 
     376                  echo '<input type="hidden" name="page_id" value="'.$id.'" />'."\n"; 
     377            } else { 
     378                  echo '<form action="'.$permalink.'emailpopup/" method="post">'."\n"; 
     379                  echo '<input type="hidden" name="p" value="'.$id.'" />'."\n"; 
     380            } 
     381      } else { 
     382            if(is_page()) { 
     383                  echo '<form action="'.$permalink.'&amp;emailpopup=1" method="post">'."\n"; 
     384                  echo '<input type="hidden" name="page_id" value="'.$id.'" />'."\n"; 
     385            } else { 
     386                  echo '<form action="'.$permalink.'&amp;emailpopup=1" method="post">'."\n"; 
     387                  echo '<input type="hidden" name="p" value="'.$id.'" />'."\n"; 
     388            } 
    377389      } 
    378390}