harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse Source
This commit is contained in:
redmatrix 2015-10-01 17:30:15 -07:00
commit dd45e7b4eb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/taxonomy.php
View File

@ -185,7 +185,7 @@ function dir_tagadelic($count = 0) {
$count = intval($count); $count = intval($count);
// Fetch tags // Fetch tags
$r = q("select xtag_term, count(xtag_term) as total from xtag $r = q("select xtag_term, count(xtag_term) as total from xtag where xtag_flags = 0
group by xtag_term order by total desc %s", group by xtag_term order by total desc %s",
((intval($count)) ? "limit $count" : '') ((intval($count)) ? "limit $count" : '')
); );

8
include/zot.php
View File

@ -902,7 +902,7 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) {
$r = q("delete from xprof where xprof_hash = '%s'", $r = q("delete from xprof where xprof_hash = '%s'",
dbesc($xchan_hash) dbesc($xchan_hash)
); );
$r = q("delete from xtag where xtag_hash = '%s'", $r = q("delete from xtag where xtag_hash = '%s' and xtag_flags = 0",
dbesc($xchan_hash) dbesc($xchan_hash)
); );
} }
@ -2600,7 +2600,7 @@ function import_directory_profile($hash, $profile, $addr, $ud_flags = UPDATE_FLA
function import_directory_keywords($hash, $keywords) { function import_directory_keywords($hash, $keywords) {
$existing = array(); $existing = array();
$r = q("select * from xtag where xtag_hash = '%s'", $r = q("select * from xtag where xtag_hash = '%s' and xtag_flags = 0",
dbesc($hash) dbesc($hash)
); );
@ -2618,14 +2618,14 @@ function import_directory_keywords($hash, $keywords) {
foreach($existing as $x) { foreach($existing as $x) {
if(! in_array($x, $clean)) if(! in_array($x, $clean))
$r = q("delete from xtag where xtag_hash = '%s' and xtag_term = '%s'", $r = q("delete from xtag where xtag_hash = '%s' and xtag_term = '%s' and xtag_flags = 0",
dbesc($hash), dbesc($hash),
dbesc($x) dbesc($x)
); );
} }
foreach($clean as $x) { foreach($clean as $x) {
if(! in_array($x, $existing)) { if(! in_array($x, $existing)) {
$r = q("insert into xtag ( xtag_hash, xtag_term) values ( '%s' ,'%s' )", $r = q("insert into xtag ( xtag_hash, xtag_term, xtag_flags) values ( '%s' ,'%s', 0 )",
dbesc($hash), dbesc($hash),
dbesc($x) dbesc($x)
); );