projects
/
old-projects.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
locales modifications. left joins are for a future release
[old-projects.git]
/
philter
/
philter
/
include
/
rule.inc.php
diff --git
a/philter/philter/include/rule.inc.php
b/philter/philter/include/rule.inc.php
index
d03d888
..
41514b4
100644
(file)
--- a/
philter/philter/include/rule.inc.php
+++ b/
philter/philter/include/rule.inc.php
@@
-47,13
+47,13
@@
class Rule {
function sql_get_actions($_uid, $_rid) {
global $philter;
function sql_get_actions($_uid, $_rid) {
global $philter;
-
+ /*
$left_joins = "";
foreach($philter->config['action_plugins'] as $plug)
$left_joins .= $plug->sql_get();
$left_joins = "";
foreach($philter->config['action_plugins'] as $plug)
$left_joins .= $plug->sql_get();
-
+ */
$bd = bd()."actions";
$bd = bd()."actions";
- $sql = mysql_query("SELECT * FROM $bd WHERE $bd.uid='$_uid' AND $bd.rid='$_rid'
".$left_joins
);
+ $sql = mysql_query("SELECT * FROM $bd WHERE $bd.uid='$_uid' AND $bd.rid='$_rid'
"
);
while($t = mysql_fetch_assoc($sql))
$this->actions[] = $philter->config['action_plugins'][$t['pid']]->sql_to_data($t);
while($t = mysql_fetch_assoc($sql))
$this->actions[] = $philter->config['action_plugins'][$t['pid']]->sql_to_data($t);
@@
-61,13
+61,15
@@
class Rule {
function sql_get_matches($_uid, $_rid) {
global $philter;
function sql_get_matches($_uid, $_rid) {
global $philter;
-
+
+ /*
$left_joins = "";
foreach($philter->config['match_plugins'] as $plug)
$left_joins .= $plug->sql_get();
$left_joins = "";
foreach($philter->config['match_plugins'] as $plug)
$left_joins .= $plug->sql_get();
+ */
$bd = bd()."matches";
$bd = bd()."matches";
- $sql = mysql_query("SELECT * FROM $bd WHERE $bd.uid='$_uid' AND $bd.rid='$_rid'
".$left_joins
);
+ $sql = mysql_query("SELECT * FROM $bd WHERE $bd.uid='$_uid' AND $bd.rid='$_rid'
"
);
if($_rid)
while($t = mysql_fetch_assoc($sql))
if($_rid)
while($t = mysql_fetch_assoc($sql))