)(.*)(".preg_quote(WP_FOOTNOTES_CLOSE)."|<\/footnote>)/Us", $data, $identifiers, PREG_SET_ORDER)) {
+ // Remove codeblocks from content to be parsed for footnotes
+ $data_sans_codeblocks = preg_replace("/()(.*)(<\/pre>)/Us", '', $data);
+
+ // Regex extraction of all footnotes from non-codeblock content (or return if there are none)
+ if (!preg_match_all("/(".preg_quote(self::MP_WP_FOOTNOTES_OPEN)."|)(.*)(".preg_quote(self::MP_WP_FOOTNOTES_CLOSE)."|<\/footnote>)/Us", $data_sans_codeblocks, $identifiers, PREG_SET_ORDER)) {
return $data;
}
// Check whether we are displaying them or not
$display = true;
- if ($this->current_options['no_display_home'] && is_home()) $display = false;
- if ($this->current_options['no_display_archive'] && is_archive()) $display = false;
- if ($this->current_options['no_display_date'] && is_date()) $display = false;
- if ($this->current_options['no_display_category'] && is_category()) $display = false;
- if ($this->current_options['no_display_search'] && is_search()) $display = false;
- if ($this->current_options['no_display_feed'] && is_feed()) $display = false;
+ if ($this->options['no_display_home'] && is_home()) $display = false;
+ if ($this->options['no_display_archive'] && is_archive()) $display = false;
+ if ($this->options['no_display_date'] && is_date()) $display = false;
+ if ($this->options['no_display_category'] && is_category()) $display = false;
+ if ($this->options['no_display_search'] && is_search()) $display = false;
+ if ($this->options['no_display_feed'] && is_feed()) $display = false;
$footnotes = array();
@@ -160,7 +163,7 @@
if ( array_key_exists(get_post_meta($post->ID, 'footnote_style', true), $this->styles) ) {
$style = get_post_meta($post->ID, 'footnote_style', true);
} else {
- $style = $this->current_options['list_style_type'];
+ $style = $this->options['list_style_type'];
}
// Create 'em
@@ -175,7 +178,7 @@
// if we're combining identical notes check if we've already got one like this & record keys
- if ($this->current_options['combine_identical_notes']){
+ if ($this->options['combine_identical_notes']){
for ($j=0; $jID;
$id_num = ($style == 'decimal') ? $value['use_footnote']+$start_number : $this->convert_num($value['use_footnote']+$start_number, $style, count($footnotes));
$id_href = ( ($use_full_link) ? get_permalink($post->ID) : '' ) . "#footnote_".$value['use_footnote']."_".$post->ID;
-
-// $id_title = str_replace('"', """, htmlentities(strip_tags($value['text']), ENT_QUOTES, 'UTF-8'));
-
$id_title = str_replace('"', '`', strip_tags($value['text']));
- $id_replace = $this->current_options['pre_identifier'].''.$this->current_options['post_identifier'];
- if ($this->current_options['superscript']) $id_replace = ''.$id_replace.'';
+ $id_replace = $this->options['pre_identifier'].''.$this->options['post_identifier'];
+ if ($this->options['superscript']) $id_replace = ''.$id_replace.'';
if ($display) $data = substr_replace($data, $id_replace, strpos($data,$value[0]),strlen($value[0]));
else $data = substr_replace($data, '', strpos($data,$value[0]),strlen($value[0]));
}
@@ -219,14 +219,14 @@
// Display footnotes
if ($display) {
$start = ($start_number != 1) ? 'start="'.$start_number.'" ' : '';
- $data = $data.$this->current_options['pre_footnotes'];
+ $data = $data.$this->options['pre_footnotes'];
$data = $data . '';
foreach ($footnotes as $key => $value) {
$data = $data.'';
}
- $data = $data . '
' . $this->current_options['post_footnotes'];
+ $data = $data . '' . $this->options['post_footnotes'];
}
return $data;
}
- /**
- * Really insert the options page.
- */
- function footnotes_options_page() {
- $this->current_options = get_option('swas_footnote_options');
- foreach ($this->current_options as $key=>$setting) {
- $new_setting[$key] = htmlentities($setting);
- }
- $this->current_options = $new_setting;
- unset($new_setting);
- include (dirname(__FILE__) . '/options.php');
- }
-
- /**
- * Insert the options page into the admin area.
- */
- function add_options_page() {
- // Add a new menu under Options:
- add_options_page('Footnotes', 'Footnotes', 8, __FILE__, array($this, 'footnotes_options_page'));
- }
-
- function upgrade_post($data){
- $data = str_replace('',WP_FOOTNOTES_OPEN,$data);
- $data = str_replace('',WP_FOOTNOTES_CLOSE,$data);
- return $data;
- }
-
- function insert_styles(){
+ function insert_styles() {
?>
current_options['list_style_symbol'];
+ $sym .= $this->options['list_style_symbol'];
}
return $sym;
}
@@ -318,7 +301,7 @@
* @param string $case Upper or lower case.
* @return string The roman numeral
*/
- function roman($num, $case= 'upper'){
+ function roman($num, $case= 'upper') {
$num = (int) $num;
$conversion = array('M'=>1000, 'CM'=>900, 'D'=>500, 'CD'=>400, 'C'=>100, 'XC'=>90, 'L'=>50, 'XL'=>40, 'X'=>10, 'IX'=>9, 'V'=>5, 'IV'=>4, 'I'=>1);
$roman = '';
@@ -331,7 +314,7 @@
return ($case == 'lower') ? strtolower($roman) : $roman;
}
- function alpha($num, $case='upper'){
+ function alpha($num, $case='upper') {
$j = 1;
for ($i = 'A'; $i <= 'ZZ'; $i++){
if ($j == $num){