-
Notifications
You must be signed in to change notification settings - Fork 44
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
I got your sourceforge cvs history back #3
Open
fwolf
wants to merge
94
commits into
kellan:master
Choose a base branch
from
fwolf:pull
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* rss_fetch got rid of the options array, replaced it with a more PHP-like solution of using defines. constants are setup, with defaults, in the function init() got rid of the idiom of passing back an array, its was awkward to deal with in PHP, and unusual (and consquently confusing to people). now i return true/false values, and try to setup error string where appropiate (rss_cache has the most complete example of this) change the logic for interacting with the cache * rss_cache major re-working of how error are handled. tried to make the code more resillient. the cache is now much more aware of MAX_AGE, where before this was being driven out of rss_fetch (which was silly) * rss_parse properly handles xml parse errors. used to sail along blithely unaware.
in Smarty and Snoopy :)
added support for conditional gets
magpie's errors. added method magpie_error() to retrieve global MAGPIE_ERROR variable for when fetch_rss() returns false
magpie_simple - is a simple example magpie_debug - spew all the information from a parsed RSS feed simple_smary - example of using magpie with Smarty template system smarty_plugin/modifier.rss_date_parse.php - support file for the smarty demo templates/simple.smary - template for the smarty demo
TROUBLESHOOTING cover common installation and usage problems
fixed a debug statement that was being called as an error
also throw better xml errors
indexes' notices. * Magpie now automatically includes its version in the user-agent, & whether cacheing is turned on.
'Undefined Indexes' notices
add support for atom 1.0, repeating elements, and attributes
…ride of defined MAGPIE_CACHE_AGE.
…ssion was not necessary. This preps for PHP 5.3 where ereg() and split() functions are no longer bundled.
Conflicts: extlib/Snoopy.class.inc rss_fetch.inc rss_parse.inc scripts/magpie_debug.php
Conflicts: rss_parse.inc
Conflicts: rss_fetch.inc rss_parse.inc
Conflicts: rss_parse.inc
Wow, that's a chunk of work. Thoughts on the best way to merge this? |
Yes, have history is not bad, the newest version works fine in my mirrored https://github.com/fwolf/gregarius . I also merged pull request of @straup @interjinn @benkeen , glad to see you back :-) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Maybe you want them merged, I had already solved conflict between sf code with you newest code ( 131cdc8 for now ).