[phpwiki-checkins] SF.net SVN: phpwiki:[9616] trunk/lib/WikiDB/backend/PearDB_ffpgsql.php

[<var...@us...>]

Revision: 9616
          http://sourceforge.net/p/phpwiki/code/9616
Author:   vargenau
Date:     2015-03-06 12:56:54 +0000 (Fri, 06 Mar 2015)
Log Message:
-----------
Fix WantedPages for Fusionforge

Modified Paths:
--------------
    trunk/lib/WikiDB/backend/PearDB_ffpgsql.php

Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2015-03-06 11:52:49 UTC (rev 9615)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2015-03-06 12:56:54 UTC (rev 9616)
@@ -551,10 +551,10 @@
             $orderby = 'ORDER BY ' . $orderby;
 
         if ($exclude_from) // array of pagenames
-            $exclude_from = " AND pp.pagename NOT IN " . $this->_sql_set($exclude_from);
+            $exclude_from = " AND substring(p.pagename from $p) NOT IN " . $this->_sql_set($exclude_from);
         if ($exclude) // array of pagenames
-            $exclude = " AND p.pagename NOT IN " . $this->_sql_set($exclude);
-        $sql = "SELECT substring(p.pagename from $p) AS wantedfrom, substring(pp.pagename from $p) AS pagename"
+            $exclude = " AND substring(p.pagename from $p) NOT IN " . $this->_sql_set($exclude);
+        $sql = "SELECT substring(pp.pagename from $p) AS wantedfrom, substring(p.pagename from $p) AS pagename"
             . " FROM $page_tbl AS p, $link_tbl AS linked"
             . " LEFT JOIN $page_tbl AS pp ON linked.linkto = pp.id"
             . " LEFT JOIN $nonempty_tbl AS ne ON linked.linkto = ne.id"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.