diff --git a/ext/numeric_score/main.php b/ext/numeric_score/main.php index 8cb65a7b..b7efed34 100644 --- a/ext/numeric_score/main.php +++ b/ext/numeric_score/main.php @@ -247,9 +247,9 @@ class NumericScore extends Extension { "images.id in (SELECT image_id FROM numeric_score_votes WHERE user_id=:ns_user_id AND score=-1)", array("ns_user_id"=>$iid))); } - else if(preg_match("/^order[=|:](numeric_)?(score)[_]?(desc|asc)?$/i", $event->term, $matches)){ + else if(preg_match("/^order[=|:](?:numeric_)?(score)(?:_(desc|asc))?$/i", $event->term, $matches)){ $default_order_for_column = "DESC"; - $sort = isset($matches[3]) ? strtoupper($matches[3]) : $default_order_for_column; + $sort = isset($matches[2]) ? strtoupper($matches[2]) : $default_order_for_column; Image::$order_sql = "images.numeric_score $sort"; $event->add_querylet(new Querylet("1=1")); //small hack to avoid metatag being treated as normal tag } diff --git a/ext/user/main.php b/ext/user/main.php index 19f87ca7..32d31eaa 100644 --- a/ext/user/main.php +++ b/ext/user/main.php @@ -313,8 +313,8 @@ class UserPage extends Extension { global $user; $matches = array(); - if(preg_match("/^(poster|user)[=|:](.*)$/i", $event->term, $matches)) { - $duser = User::by_name($matches[2]); + if(preg_match("/^(?:poster|user)[=|:](.*)$/i", $event->term, $matches)) { + $duser = User::by_name($matches[1]); if(!is_null($duser)) { $user_id = $duser->id; } @@ -323,12 +323,12 @@ class UserPage extends Extension { } $event->add_querylet(new Querylet("images.owner_id = $user_id")); } - else if(preg_match("/^(poster|user)_id[=|:]([0-9]+)$/i", $event->term, $matches)) { - $user_id = int_escape($matches[2]); + else if(preg_match("/^(?:poster|user)_id[=|:]([0-9]+)$/i", $event->term, $matches)) { + $user_id = int_escape($matches[1]); $event->add_querylet(new Querylet("images.owner_id = $user_id")); } - else if($user->can("view_ip") && preg_match("/^(poster|user)_ip[=|:]([0-9\.]+)$/i", $event->term, $matches)) { - $user_ip = $matches[2]; // FIXME: ip_escape? + else if($user->can("view_ip") && preg_match("/^(?:poster|user)_ip[=|:]([0-9\.]+)$/i", $event->term, $matches)) { + $user_ip = $matches[1]; // FIXME: ip_escape? $event->add_querylet(new Querylet("images.owner_ip = '$user_ip'")); } }