From fc12123329133cea39f27615a7c24c57e5b4a35d Mon Sep 17 00:00:00 2001 From: habeascodice Date: Mon, 20 Oct 2014 04:49:44 -0700 Subject: missing custom/ description --- doc/intro_for_developers.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/intro_for_developers.bb b/doc/intro_for_developers.bb index b44095d3d..7bd52aa12 100644 --- a/doc/intro_for_developers.bb +++ b/doc/intro_for_developers.bb @@ -6,6 +6,8 @@ [boot.php] Every process uses this to bootstrap the application structure +[custom] site-specific overrides of modules in mod/, excluded from git + [doc] Help Files [images] core required images -- cgit v1.2.3 From 7d0659bb2ba3e12f909b63d566e338333f5aaebd Mon Sep 17 00:00:00 2001 From: Habeas Codice Date: Tue, 18 Nov 2014 11:43:00 -0800 Subject: postgres fixes --- include/attach.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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'] . '>'), -- cgit v1.2.3 From 6cc906fd1d7226e4db2f546551c14fe04ea815e7 Mon Sep 17 00:00:00 2001 From: Habeas Codice Date: Tue, 18 Nov 2014 12:10:40 -0800 Subject: update docs --- doc/intro_for_developers.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/intro_for_developers.bb b/doc/intro_for_developers.bb index f9dbb96ff..b8a4e4eb5 100644 --- a/doc/intro_for_developers.bb +++ b/doc/intro_for_developers.bb @@ -6,8 +6,6 @@ [boot.php] Every process uses this to bootstrap the application structure -[custom] site-specific overrides of modules in mod/, excluded from git - [doc] Help Files [images] core required images @@ -22,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) -- cgit v1.2.3