| Rev | Author | # | Line |
|---|---|---|---|
| 1 | MattBrown | 1 | We are currently undertaking an effort to merge all our patches to our phpwiki source (CVS from early 2002) onto the current phpwiki HEAD so that we can more closely keep track of upstream development and help contribute new features. |
| 2 | |||
| 3 | This page tracks the patches that we've extracted out of our changes and the status of merging them into our SubVersion repository which contains regularly synched snapshots of phpwiki CVS HEAD. This page is needed because many/most of our patches aren't actually able to be applied straight to phpwiki head as lots of things have changed and many of our features have been implemented in other ways. | ||
| 4 | |||
| 5 | The canonical location for the WLUG Wiki Patches against the 2002 CVS snapshot that we use are found at http://www.wlug.org.nz/~matt/wlugwiki/ | ||
| 6 | |||
| 7 | The following sections detail each diff in that directory and it's process in being merged onto head. If you want to help with this process and need access to our SubVersion repository at http://svn.wlug.org.nz/viewcvs/?root=wiki then talk to MattBrown. | ||
| 8 | |||
| 9 | I've defined several categories that each diff can be in | ||
| 10 | * Unstarted - no one has really looked at merging this diff yet | ||
| 11 | * In Progess - someone has taken the diff and is in the process of porting it forward and testing it, please add your name to assigned to | ||
| 12 | * Checked In - the forward port has been checked in and is being tested on http://test.wlug.org.nz/ | ||
| 13 | * Forwarded - The forward port has been tested and sent upstream | ||
| 14 | * Accepted - The port is now in phpwiki upstream CVS | ||
| 15 | * Complete - WLUG SVN repository has been synched with upstream CVS revision containing the accepted patch | ||
| 16 | |||
| 17 | I've also defined several levels of difficulty based on how complex each diff looks to resovle (in my opinion) | ||
| 18 | * Trivial - Obvious 1 or 2 line patch | ||
| 19 | * Medium - Obvious change but reasonable amount of code | ||
| 20 | * Hard - Big structural changes, not obvious how to proceed | ||
| 21 | |||
| 22 | ---- | ||
| 5 | MattBrown | 23 | !!! Patches in the queue |
| 1 | MattBrown | 24 | |
| 25 | !!~AntiAbuse.php.diff | ||
| 26 | * __Description:__ John's spam fighting code | ||
| 20 | MattBrown | 27 | * __Assigned To:__ JohnMcPherson |
| 1 | MattBrown | 28 | * __Difficulty:__ Hard |
| 29 | * __Status:__ Unstarted | ||
| 30 | |||
| 31 | !!lib_~HtmlElement.php | ||
| 32 | * __Description:__ UTF8 nbsp, add <object> and <embed> tags | ||
| 20 | MattBrown | 33 | * __Assigned To:__ JohnMcPherson |
| 1 | MattBrown | 34 | * __Difficulty:__ Trivial |
| 35 | * __Status:__ Unstarted | ||
| 36 | |||
| 37 | !!lib_~RssWriter.php.diff | ||
| 38 | * __Description:__ XML Escaping | ||
| 20 | MattBrown | 39 | * __Assigned To:__ JohnMcPherson |
| 1 | MattBrown | 40 | * __Difficulty:__ Trivial |
| 41 | * __Status:__ Unstarted | ||
| 42 | |||
| 43 | !!lib_Theme.php.diff | ||
| 44 | * __Description:__ Wiki Author Links, time / date formatting, Printable CSS updates | ||
| 45 | * __Assigned To:__ | ||
| 46 | * __Difficulty:__ Medium / Hard | ||
| 47 | * __Status:__ Unstarted | ||
| 48 | |||
| 49 | !!lib_~WikiDB.php.diff | ||
| 50 | * __Description:__ Disable DB optimisation / vacuuming, Add empty page haiku's | ||
| 12 | MattBrown | 51 | * __Assigned To:__ MattBrown |
| 52 | * __Difficulty:__ Medium | ||
| 53 | * __Status:__ Forwarded - [commited in r24|http://svn.wlug.org.nz/viewcvs?root=wiki&view=rev&rev=24] and [r25|http://svn.wlug.org.nz/viewcvs?root=wiki&view=rev&rev=25] and filed upstream as [issue 1377011|http://sourceforge.net/tracker/index.php?func=detail&aid=1377011&group_id=6121&atid=306121]. Page Haiku's are already implemented upstream as fortune stuff. | ||
| 54 | |||
| 1 | MattBrown | 55 | |
| 56 | !!lib_~WikiDB_backend_~PearDB.diff | ||
| 11 | MattBrown | 57 | * __Description:__ Improve pageID allocation to use database abstraction nextId function |
| 58 | * __Assigned To:__ MattBrown | ||
| 59 | * __Difficulty:__ Trivial | ||
| 60 | * __Status:__ Forwarded - [committed in r23|http://svn.wlug.org.nz/viewcvs?root=wiki&rev=23&view=rev] and filed upstream as [issue 1376988|http://sourceforge.net/tracker/index.php?func=detail&aid=1376988&group_id=6121&atid=306121] | ||
| 1 | MattBrown | 61 | |
| 62 | !!lib_config.php.diff | ||
| 63 | * __Description:__ UTF8 and regexp fixes | ||
| 20 | MattBrown | 64 | * __Assigned To:__ JohnMcPherson |
| 1 | MattBrown | 65 | * __Difficulty:__ Medium |
| 66 | * __Status:__ Unstarted | ||
| 67 | |||
| 68 | !!lib_diff.php.diff | ||
| 69 | * __Description:__ last modification string add author name, add template for diff output | ||
| 14 | MattBrown | 70 | * __Assigned To:__ MattBrown |
| 1 | MattBrown | 71 | * __Difficulty:__ Medium |
| 14 | MattBrown | 72 | * __Status:__ Forwarded - Diff template output added in [revision 29|http://svn.wlug.org.nz/viewcvs?root=wiki&view=rev&rev=29] and forwarded upstream as [sf patch 1377636|http://sourceforge.net/tracker/index.php?func=detail&aid=1377636&group_id=6121&atid=306121]. Adding the author string to the last modified string is not longer relevant and has been superseded by upstream code. |
| 1 | MattBrown | 73 | |
| 74 | !!lib_editpage.php.diff | ||
| 75 | * __Description:__ UTF8, spam prevention, new markup | ||
| 20 | MattBrown | 76 | * __Assigned To:__ JohnMcPherson |
| 1 | MattBrown | 77 | * __Difficulty:__ Medium |
| 78 | * __Status:__ Unstarted | ||
| 79 | |||
| 80 | !!lib_main.php.diff | ||
| 81 | * __Description:__ UTF8 fixes | ||
| 20 | MattBrown | 82 | * __Assigned To:__ JohnMcPherson |
| 1 | MattBrown | 83 | * __Difficulty:__ Trivial |
| 84 | * __Status:__ Unstarted | ||
| 85 | |||
| 86 | !!lib_plugin_~FullTextSearch.php.diff | ||
| 87 | * __Description:__ WLUG specific disable... | ||
| 88 | * __Assigned To:__ | ||
| 89 | * __Difficulty:__ Trivial | ||
| 90 | * __Status:__ Unstarted. Unlikely to be merged upstream. Perhaps a more general disable method is needed? | ||
| 91 | |||
| 92 | !!lib_plugin_Jabber.php.diff | ||
| 93 | * __Description:__ WLUG specific jabber plugin (hardcodes jabber.mnnz) could be made more generic | ||
| 94 | * __Assigned To:__ | ||
| 95 | * __Difficulty:__ Medium | ||
| 20 | MattBrown | 96 | * __Status:__ In Progress - I haven't merged this plugin, but jabber support seems to be working anyway... Maybe unneeded. |
| 1 | MattBrown | 97 | |
| 98 | !!lib_plugin_~RecentChanges.php.diff | ||
| 99 | * __Description:__ Wiki author link addition, robots nofollow addition | ||
| 100 | * __Assigned To:__ | ||
| 101 | * __Difficulty:__ Trivial | ||
| 17 | MattBrown | 102 | * __Status:__ Forwarded - Committed in [r43|http://svn.wlug.org.nz/viewcvs?root=wiki&rev=43&view=rev] and filed upstream as patch [1434538|http://sourceforge.net/tracker/index.php?func=detail&aid=1434538&group_id=6121&atid=306121] |
| 1 | MattBrown | 103 | |
| 104 | !!lib_stdlib.php.diff | ||
| 105 | * __Description:__ Jabber implementation, <object> and <embed> implementation, new markup backport | ||
| 20 | MattBrown | 106 | * __Assigned To:__ JohnMcPherson |
| 1 | MattBrown | 107 | * __Difficulty:__ Medium / Hard |
| 20 | MattBrown | 108 | * __Status:__ In Progress - Do we really need the jabber icons on JID links? It's going to be hard to do in a way that is able to be passed upstream. we already have them on any proper link... |
| 5 | MattBrown | 109 | |
| 110 | ---- | ||
| 111 | !!! Patches that have already been dealt with and need no further action | ||
| 21 | MattBrown | 112 | |
| 113 | !!lib_display.php.diff | ||
| 114 | * __Description:__ Caching, sidebar, robots noindex,nofollow | ||
| 115 | * __Assigned To:__ | ||
| 116 | * __Difficulty:__ Hard / Medium | ||
| 117 | * __Status:__ Completed - Sidebar functionality implemented in [r34|http://svn.wlug.org.nz/viewcvs?root=wiki&rev=34&view=rev], Caching stuff has been implemented upstream. Patches not required. noindex, nofollow improvements committed in [r57|http://svn.wlug.org.nz/viewcvs?root=wiki&rev=57&view=rev] and filed upstream as [issue 1438487|http://sourceforge.net/tracker/index.php?func=detail&aid=1438487&group_id=6121&atid=306121] which has been accepted into upstream CVS and is available in releases after 1.3.12p1 | ||
| 10 | MattBrown | 118 | |
| 119 | !! lib_~BlockParser.php | ||
| 120 | * __Description:__ Backported new markup implementation? | ||
| 121 | * __Status:__ Complete - _match change was backported. No action required. _hdr ID addition superseded by CreateTocPlugin in 1.3.11p1. | ||
| 8 | MattBrown | 122 | |
| 123 | !!lib_interwiki.map.diff | ||
| 124 | * __Description:__ As with previous | ||
| 125 | * __Status:__ Complete - PHPwiki, Twiki and Wikipedia entries already updated upstream. Jargon file entry pointed to WLUG Greenstone - [committed in r21|http://svn.wlug.org.nz/viewcvs?root=wiki&rev=21&view=rev]. | ||
| 19 | MattBrown | 126 | |
| 127 | !!lib_~WikiUser.php.diff | ||
| 128 | * __Description:__ noindex,nofollow addition | ||
| 129 | * __Assigned To:__ | ||
| 130 | * __Difficulty:__ Trivial | ||
| 131 | * __Status:__ Complete - Already present in upstream 1.3.11p1 release. | ||
| 21 | MattBrown | 132 | |
| 133 | !!lib_plugin_Calendar.php.diff | ||
| 134 | * __Description:__ robots nofollow | ||
| 135 | * __Assigned To:__ | ||
| 136 | * __Difficulty:__ Trivial | ||
| 137 | * __Status:__ Completed - Committed in [r57|http://svn.wlug.org.nz/viewcvs?root=wiki&rev=57&view=rev] and filed upstream as [issue 1438487|http://sourceforge.net/tracker/index.php?func=detail&aid=1438487&group_id=6121&atid=306121] which has been committed to CVS and is available in releases after 1.3.12p1 | ||
| 5 | MattBrown | 138 | |
| 139 | !!lib_plugin_~GreenStone.php.diff | ||
| 140 | * __Description:__ WLUG greenstone implementation | ||
| 141 | * __Status:__ Complete - [Added in r20|http://svn.wlug.org.nz/viewcvs?root=wiki&rev=20&view=rev], not a candidate for upstream push. | ||
| 13 | MattBrown | 142 | |
| 143 | !!lib_plugin_~IncludePage.php.diff | ||
| 144 | * __Description:__ backported some new markup changes and added float support. | ||
| 145 | * __Status:__ Complete - mostly backported. No action required. Float support is obsolete and not required. | ||
| 5 | MattBrown | 146 | |
| 147 | !!lib_plugin_Info.php.diff | ||
| 148 | * __Description:__ Page info. I think this is backported? | ||
| 149 | * __Status:__ Complete - was backported. No action required. Is called Page Info in 1.3.11p1. | ||
| 150 | |||
| 151 | !!lib_plugin_~OldStyleTable.php.diff | ||
| 152 | * __Description:__ Backported old style table plugin | ||
| 153 | * __Status:__ Complete - was backported. No action required. | ||
| 154 | |||
| 155 | !!lib_plugin_~OrphanedPages.php.diff | ||
| 156 | * __Description:__ Backported orphaned pages plugin? | ||
| 157 | * __Status:__ Complete - was backported. No action required. | ||
| 158 | |||
| 159 | !!lib_plugin_~RedirectTo.php.diff | ||
| 160 | * __Description:__ Backported redirect to plugin? | ||
| 161 | * __Status:__ Complete - was backported. No action required. | ||
| 162 | |||
| 163 | !!lib_plugin_~WikiForm.php.diff | ||
| 164 | * __Description:__ Backported ~WikiForm plugin? | ||
| 165 | * __Status:__ Complete - was backported. No action required. | ||
| 16 | MattBrown | 166 | |
| 167 | !!lib_plugin_~WlugMember.php.diff | ||
| 168 | * __Description:__ WLUG specific LDAP membership | ||
| 169 | * __Assigned To:__ | ||
| 170 | * __Difficulty:__ Medium | ||
| 171 | * __Status:__ Completed - Added in [r35|http://svn.wlug.org.nz/viewcvs?root=wiki&rev=35&view=rev] | ||
| 172 | |||
| 173 | !!lib_plugin_~WlugWantedPages.php.diff | ||
| 174 | * __Description:__ WLUG specific required pages, should be made more generic? | ||
| 175 | * __Assigned To:__ | ||
| 176 | * __Difficulty:__ Medium | ||
| 177 | * __Status:__ Completed - Added in [r39|http://svn.wlug.org.nz/viewcvs?root=wiki&rev=39&view=rev] | ||
| 7 | MattBrown | 178 | |
| 179 | !!soap.wsdl.diff | ||
| 180 | * __Description:__ Backported soap implementation? | ||
| 181 | * __Status:__ Complete - Much more featureful implementation is present in 1.3.11p1 | ||
| 10 | MattBrown | 182 | |
| 183 | !!lib_transform.php.diff | ||
| 184 | * __Description:__ footnotes / old markup changes | ||
| 185 | * __Status:__ Complete - Code appears to be obsolete. Cannot find in 1.3.11p1. Assuming no action is required. |
lib/blame.php:177: Warning: Invalid argument supplied for foreach() (...repeated 24 times)