Skip to content

Fix operator issue and Dreamweaver regex #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
seanherbert87 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix operator issue and Dreamweaver regex #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e02b7a
Fix operator issue and Dreamweaver regex
walkingcorpse Oct 26, 2017
04249b6
Merge pull request #1 from walkingcorpse/walkingcorpse-patch-1
walkingcorpse Oct 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions html-importer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ function get_post( $path = '', $placeholder = false ) {
// title
if ( $options['import_title'] == "region" ) {
// appending strings unnecessarily so this plugin can be edited in Dreamweaver if needed
$titlematch = '/<'.'!-- InstanceBeginEditable name="'.$options['title_region'].'" --'.'>( .* )<'.'!-- InstanceEndEditable --'.'>/isU';
$titlematch = '/<'.'!-- InstanceBeginEditable name="'.$options['title_region'].'" --'.'>(.*)<'.'!-- InstanceEndEditable --'.'>/isU';
preg_match( $titlematch, $this->file, $titlematches );
$my_post['post_title'] = strip_tags( trim( $titlematches[1] ) );
}
Expand Down Expand Up @@ -471,7 +471,7 @@ function get_post( $path = '', $placeholder = false ) {
else if ( $options['timestamp'] == 'customfield' ) {
if ( $options['import_date'] == "region" ) {
// appending strings unnecessarily so this plugin can be edited in Dreamweaver if needed
$datematch = '/<'.'!-- InstanceBeginEditable name="'.$options['date_region'].'" --'.'>( .* )<'.'!-- InstanceEndEditable --'.'>/isU';
$datematch = '/<'.'!-- InstanceBeginEditable name="'.$options['date_region'].'" --'.'>(.*)<'.'!-- InstanceEndEditable --'.'>/isU';
preg_match( $datematch, $this->file, $datematches );
$date = $datematches[1];
}
Expand Down Expand Up @@ -505,7 +505,7 @@ function get_post( $path = '', $placeholder = false ) {
// content
if ( $options['import_content'] == "region" ) {
// appending strings unnecessarily so this plugin can be edited in Dreamweaver if needed
$contentmatch = '/<'.'!-- InstanceBeginEditable name="'.$options['content_region'].'" --'.'>( .* )<'.'!-- InstanceEndEditable --'.'>/isU';
$contentmatch = '/<'.'!-- InstanceBeginEditable name="'.$options['content_region'].'" --'.'>(.*)<'.'!-- InstanceEndEditable --'.'>/isU';
preg_match( $contentmatch, $this->file, $contentmatches );
$my_post['post_content'] = $contentmatches[1];
}
Expand Down Expand Up @@ -548,7 +548,7 @@ function get_post( $path = '', $placeholder = false ) {
if ( !empty( $fieldname ) ) {
if ( $options['import_field'][$index] == "region" ) {
// appending strings unnecessarily so this plugin can be edited in Dreamweaver if needed
$custommatch = '/<'.'!-- InstanceBeginEditable name="'.$options['customfield_region'][$index].'" --'.'>( .* )<'.'!-- InstanceEndEditable --'.'>/isU';
$custommatch = '/<'.'!-- InstanceBeginEditable name="'.$options['customfield_region'][$index].'" --'.'>(.*)<'.'!-- InstanceEndEditable --'.'>/isU';
preg_match( $custommatch, $this->file, $custommatches );
if ( isset( $custommatches[1] ) )
$customfields[$fieldname] = $custommatches[1];
Expand Down Expand Up @@ -1111,7 +1111,7 @@ function import() {
if ( validate_import_file( $options['root_directory'] ) > 0 )
wp_die( __( "The beginning directory you entered is not an absolute path. Relative paths are not allowed here.", 'import-html-pages' ) );

$this->table = '';
$this->table = array();
$this->redirects = '';
$this->filearr = array();
$skipdirs = explode( ",", $options['skipdirs'] );
Expand Down Expand Up @@ -1198,4 +1198,4 @@ function mb_strlen( $string ) {
function mb_strrpos( $haystack, $needle, $offset = 0 ) {
return strrpos( utf8_decode( $haystack ), $needle, $offset );
}
}
}