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

small updates

Browse Source
This commit is contained in:
friendica
2013-05-08 21:30:54 -07:00
parent 51c27579ba
commit cb0a90d628
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/config.php
View File

@@ -17,8 +17,8 @@
function load_config($family) {
global $a;
$r = q("SELECT * FROM `config` WHERE `cat` = '%s'", dbesc($family));
if(count($r)) {
$r = q("SELECT * FROM config WHERE cat = '%s'", dbesc($family));
if($r) {
foreach($r as $rr) {
$k = $rr['k'];
if ($family === 'config') {

6
include/plugin.php
View File

@@ -169,7 +169,7 @@ function register_hook($hook,$file,$function,$priority=0) {
function unregister_hook($hook,$file,$function) {
$r = q("DELETE FROM `hook` WHERE `hook` = '%s' AND `file` = '%s' AND `function` = '%s' LIMIT 1",
$r = q("DELETE FROM hook WHERE hook = '%s' AND `file` = '%s' AND `function` = '%s' LIMIT 1",
dbesc($hook),
dbesc($file),
dbesc($function)
@@ -187,8 +187,8 @@ function unregister_hook($hook,$file,$function) {
function load_hooks() {
$a = get_app();
$a->hooks = array();
$r = q("SELECT * FROM `hook` WHERE 1 ORDER BY `priority` DESC");
if(count($r)) {
$r = q("SELECT * FROM hook WHERE true ORDER BY priority DESC");
if($r) {
foreach($r as $rr) {
if(! array_key_exists($rr['hook'],$a->hooks))
$a->hooks[$rr['hook']] = array();

3
include/zot.php
View File

@@ -1218,6 +1218,7 @@ function import_directory_profile($hash,$profile) {
import_directory_keywords($hash,$profile['keywords']);
foreach($profile['keywords'] as $kw) {
$kw = trim(htmlentities($kw,ENT_COMPAT,'UTF-8',false));
$kw = trim($kw,',');
}
$clean[] = $kw;
}
@@ -1312,7 +1313,7 @@ function import_directory_keywords($hash,$keywords) {
}
foreach($clean as $x) {
if(! in_array($x,$existing))
$r = q("insert int xtag ( xtag_hash, xtag_term) values ( '%s' ,'%s' )",
$r = q("insert into xtag ( xtag_hash, xtag_term) values ( '%s' ,'%s' )",
dbesc($hash),
dbesc($x)
);