Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Get attachment filename #397

Closed
wants to merge 15 commits into from
Closed

Get attachment filename #397

wants to merge 15 commits into from

Conversation

joshuaadickerson
Copy link
Contributor

Added a new function, removed bad functionality, and reordered parameters.

Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
Not sure if it is needed by all of the databases, but it doesn't belong in reloadSettings() and should be done immediately upon connection in MySQL
Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
… boards

Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
get rid of the $new parameter in getAttachmentFilename()
Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
…of this query. If $file_hash is empty, it is because it isn't set in the database.

Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
@eurich
Copy link
Member

eurich commented May 13, 2013

I believe commits #a5f3768 and #a28d54b doesn't belong to this branch / PR? You might have screwed up your master branch at some point (mistakenly commited to your local master branch)?

To get your master back in sync with the upstream again it might help to do a reset --hard
git checkout master
git reset -- hard < some_old_comit_id>
git pull upstream master

Note: The < some_old_comit_id> needs to be older than #a5f3768
But let's wait for @norv , I'm still a git "newbie"

This was referenced May 14, 2013
@joshuaadickerson
Copy link
Contributor Author

Norv picked the appropriate commits

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants