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

Merge pull request #701 from habeascodice/master

Browse Source 
minor postgres fixes
This commit is contained in:
RedMatrix 2014-11-19 08:55:18 +11:00
commit f137f50e3b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/intro_for_developers.bb
View File

@ -20,6 +20,8 @@
[mod] Controller modules based on URL pathname (e.g. #^[url=http://sitename/foo]http://sitename/foo[/url] loads mod/foo.php)
[mod/site/] site-specific mod overrides, excluded from git
[util] translation tools, main English string database and other miscellaneous utilities
[version.inc] contains current version (auto-updated via cron for the master repository and distributed via git)

6
include/attach.php
View File

@ -404,7 +404,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
dbesc($filename),
dbesc($mimetype),
intval($filesize),
dbesc(@file_get_contents($src)),
dbescbin(@file_get_contents($src)),
dbesc($created),
intval($existing_id),
intval($channel_id)
@ -421,7 +421,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
dbesc($mimetype),
intval($filesize),
intval($x[0]['revision'] + 1),
dbesc(@file_get_contents($src)),
dbescbin(@file_get_contents($src)),
dbesc($created),
dbesc($created),
dbesc($x[0]['allow_cid']),
@ -455,7 +455,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
dbesc($mimetype),
intval($filesize),
intval(0),
dbesc(@file_get_contents($src)),
dbescbin(@file_get_contents($src)),
dbesc($created),
dbesc($created),
dbesc(($arr && array_key_exists('allow_cid',$arr)) ? $arr['allow_cid'] : '<' . $channel['channel_hash'] . '>'),