diff options
| author | RedMatrix <info@friendica.com> | 2014-11-19 08:55:18 +1100 |
|---|---|---|
| committer | RedMatrix <info@friendica.com> | 2014-11-19 08:55:18 +1100 |
| commit | f137f50e3b8a17f33b978bd13b72e64af249bab3 (patch) | |
| tree | 9e3fc659dda7a83640087b4ca5c216190c99f012 | |
| parent | fd10b49fbfa39ad5992303edfbbc0565a0a02af2 (diff) | |
| parent | 6cc906fd1d7226e4db2f546551c14fe04ea815e7 (diff) | |
| download | volse-hubzilla-f137f50e3b8a17f33b978bd13b72e64af249bab3.tar.gz volse-hubzilla-f137f50e3b8a17f33b978bd13b72e64af249bab3.tar.bz2 volse-hubzilla-f137f50e3b8a17f33b978bd13b72e64af249bab3.zip | |
Merge pull request #701 from habeascodice/master
minor postgres fixes
| -rw-r--r-- | doc/intro_for_developers.bb | 2 | ||||
| -rw-r--r-- | include/attach.php | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/doc/intro_for_developers.bb b/doc/intro_for_developers.bb index 50aedd0e2..b8a4e4eb5 100644 --- a/doc/intro_for_developers.bb +++ b/doc/intro_for_developers.bb @@ -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)
diff --git a/include/attach.php b/include/attach.php index 87d618afa..8541c142c 100644 --- a/include/attach.php +++ b/include/attach.php @@ -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'] . '>'), |