Skip to content

Fix various notices #1061

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
r-a-y wants to merge 4 commits into
base: 5.2.x
Choose a base branch
from
Open

Fix various notices #1061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8ba5798
Fix deprecated get_magic_quotes_gpc() notice.
r-a-y May 26, 2020
4428b08
Fix "Array to string conversion" notice.
r-a-y May 26, 2020
b5f07ed
Fix "preg_match(): Compilation failed: invalid range in character cla…
r-a-y May 26, 2020
fed17a0
Fix "preg_match_all(): Compilation failed: invalid range in character…
r-a-y May 26, 2020
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
5 changes: 3 additions & 2 deletions Controllers/PF_Readability.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ public function get_readable_text( $args ) {
$url = pressforward( 'controller.http_tools' )->resolve_full_url( $url );
// var_dump($url); die();
$descrip = rawurldecode( $descrip );
if ( get_magic_quotes_gpc() ) {
$descrip = stripslashes( $descrip ); }
if ( false !== strpos( $descrip, '\\' ) ) {
$descrip = stripslashes( $descrip );
}

if ( $authorship == 'aggregation' ) {
$aggregated = true;
Expand Down
4 changes: 2 additions & 2 deletions Libraries/PFSimpleHtmlDom.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ protected function parse_selector( $selector_string ) {
// This implies that an html attribute specifier may start with an @ sign that is NOT captured by the expression.
// farther study is required to determine of this should be documented or removed.
// $pattern = "/([\w-:\*]*)(?:\#([\w-]+)|\.([\w-]+))?(?:\[@?(!?[\w-]+)(?:([!*^$]?=)[\"']?(.*?)[\"']?)?\])?([\/, ]+)/is";
$pattern = "/([\w-:\*]*)(?:\#([\w-]+)|\.([\w-]+))?(?:\[@?(!?[\w-:]+)(?:([!*^$]?=)[\"']?(.*?)[\"']?)?\])?([\/, ]+)/is";
$pattern = "/([\w\-:\*]*)(?:\#([\w\-]+)|\.([\w\-]+))?(?:\[@?(!?[\w\-:]+)(?:([!*^$]?=)[\"']?(.*?)[\"']?)?\])?([\/, ]+)/is";
preg_match_all( $pattern, trim( $selector_string ) . ' ', $matches, PREG_SET_ORDER );
if ( is_object( $debugObject ) ) {$debugObject->debugLog( 2, 'Matches Array: ', $matches );}

Expand Down Expand Up @@ -1073,7 +1073,7 @@ protected function read_tag() {
return true;
}

if ( ! preg_match( '/^[\w-:]+$/', $tag ) ) {
if ( ! preg_match( '/^[\w\-:]+$/', $tag ) ) {
$node->_[ PF_HDOM_INFO_TEXT ] = '<' . $tag . $this->copy_until( '<>' );
if ( $this->char === '<' ) {
$this->link_nodes( $node, false );
Expand Down
3 changes: 3 additions & 0 deletions includes/functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,9 @@ function pf_prep_item_for_submit( $item ) {
}

if ( is_array( $itemPart ) ) {
if ( 'nominators' === $itemKey ) {
$itemPart = array_keys( $itemPart );
}
$itemPart = implode( ',',$itemPart );
}

Expand Down