Changeset 3622:d7c2089bb952 for inc/core/class.dc.blog.php

Timestamp:

12/19/17 06:50:17 (8 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

3621:e1a3f3cf4930 (diff), 3611:e8ccb1c08e9f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 2.12 commits since 2.12.1 in default branch

Files:

• inc/core/class.dc.blog.php (modified) (2 diffs)
• inc/core/class.dc.blog.php (modified) (1 diff)

inc/core/class.dc.blog.php

@@ -694 +694 @@
           if (!$rs->isEmpty())
           {
-               if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli') {
+               if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli' || $this->con->driver() == 'mysqlimb4') {
                     $clause = "REGEXP '^".$this->con->escape($url)."[0-9]+$'";
                } elseif ($this->con->driver() == 'pgsql') {
@@ -1939 +1939 @@
           if (!$rs->isEmpty())
           {
-               if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli') {
+               if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli' || $this->con->driver() == 'mysqlimb4') {
                     $clause = "REGEXP '^".$this->con->escape(preg_quote($url))."[0-9]+$'";
                } elseif ($this->con->driver() == 'pgsql') {

inc/core/class.dc.blog.php

@@ -1940 +1940 @@
           {
                if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli' || $this->con->driver() == 'mysqlimb4') {
-                    $clause = "REGEXP '^".$this->con->escape($url)."[0-9]+$'";
+                    $clause = "REGEXP '^".$this->con->escape(preg_quote($url))."[0-9]+$'";
                } elseif ($this->con->driver() == 'pgsql') {
-                    $clause = "~ '^".$this->con->escape($url)."[0-9]+$'";
+                    $clause = "~ '^".$this->con->escape(preg_quote($url))."[0-9]+$'";
                } else {
-                    $clause = "LIKE '".$this->con->escape($url)."%'";
+                    $clause = "LIKE '".
+                              $this->con->escape(preg_replace(array('%','_','!'),array('!%','!_','!!'),$url)).
+                              "%' ESCAPE '!'";
                }
                $strReq = 'SELECT post_url FROM '.$this->prefix.'post '.