9 csets were pushed to core/userlocale: Merge [email protected]:/var/bk/xaraya/cor...
voll-111RdWWlOxkOkXtL6OYfHgC/[email protected] (Volodymyr Metenchuk)
| Newsgroups | gmane.comp.cms.xaraya.bk-notices |
|---|---|
| Organization | Xaraya |
| Message-ID | <[email protected]> |
Changes were applied by voll to core/userlocale level 15.
The following csets were applied:
ChangeSet
1.1895 05/03/13 11:22:45 [email protected] +1 -0
Merge [email protected]:/var/bk/xaraya/core/stable
into yahoo.com:/var/bk/xaraya/core/userlocale
html/includes/xarMLS.php
1.117 05/03/13 11:22:44 [email protected] +0 -0
Auto merged
ChangeSet
1.1894 05/03/13 11:22:03 voll-/[email protected] +1 -0
XML2PHP further improvement
html/includes/xarMLS.php
1.114.1.6 05/03/13 11:21:55 voll-/[email protected] +85 -50
XML2PHP further improvement
ChangeSet
1.1886.1.186 05/03/13 02:18:01 [email protected] +1 -0
_fnmatch.php:
QA
html/includes/phpcompat/stubs/functions/_fnmatch.php
1.2 05/03/13 02:17:41 [email protected] +1 -1
QA
ChangeSet
1.1886.1.185 05/03/13 02:16:25 [email protected] +2 -0
_fnmatch.php, fnmatch.php:
new file
html/includes/phpcompat/stubs/functions/_fnmatch.php
1.1 05/03/13 02:15:49 [email protected] +66 -0
html/includes/phpcompat/stubs/functions/_fnmatch.php
1.0 05/03/13 02:15:49 [email protected] +0 -0
BitKeeper file /home/e-smith/files/ibays/bk/files/core/stable/html/includes/phpcompat/stubs/functions/_fnmatch.php
html/includes/phpcompat/stubs/fnmatch.php
1.1 05/03/13 02:15:23 [email protected] +26 -0
html/includes/phpcompat/stubs/fnmatch.php
1.0 05/03/13 02:15:22 [email protected] +0 -0
BitKeeper file /home/e-smith/files/ibays/bk/files/core/stable/html/includes/phpcompat/stubs/fnmatch.php
ChangeSet
1.1886.153.1 05/03/12 22:15:34 [email protected] +1 -0
If child tags of xar:set have isAssignable, and that tag uses templates in some way (either direct or indirect), the set will include
template comments. The nonmarkup="no" attribute prevents this. It's a rare case, but this gives at least some way out. Most likely to
happen in dd property templating (if you happen to have the flags changed for some, like i have)
html/includes/blnodes/tags/set.php
1.6 05/03/12 22:15:33 [email protected] +21 -3
If child tags of xar:set have isAssignable, and that tag uses templates in some way (either direct or indirect), the set will include
template comments. The nonmarkup="no" attribute prevents this. It's a rare case, but this gives at least some way out. Most likely to
happen in dd property templating (if you happen to have the flags changed for some, like i have)
ChangeSet
1.1886.1.183 05/03/12 17:23:51 jsb-111RdWWlOxkOkXtL6OYfHgC/[email protected] +3 -0
Merge
html/includes/xarCore.php
1.170 05/03/12 17:22:53 jsb-111RdWWlOxkOkXtL6OYfHgC/[email protected] +1 -17
manual merge: went with remote (stable) version.
my changes were only trailing space removal.
html/includes/xarMLS.php
1.116 05/03/12 17:16:38 jsb-111RdWWlOxkOkXtL6OYfHgC/[email protected] +0 -0
Auto merged
html/includes/xarCache.php
1.85 05/03/12 17:16:38 jsb-111RdWWlOxkOkXtL6OYfHgC/[email protected] +0 -0
Auto merged
ChangeSet
1.1886.1.182 05/03/12 12:29:05 [email protected] +1 -0
typo
html/includes/xarBLCompiler.php
1.274 05/03/12 12:29:03 [email protected] +1 -1
typo
ChangeSet
1.1886.92.134 05/02/06 23:21:08 [email protected] +6 -0
making the var directory movable outside of the
web root.
html/var/example.key.php
1.1 05/02/06 23:21:05 [email protected] +13 -0
html/includes/xarPreCore.php
1.1 05/02/06 23:21:05 [email protected] +58 -0
html/var/example.key.php
1.0 05/02/06 23:21:05 [email protected] +0 -0
BitKeeper file /home/jonn/projects/jsb/core/movablevar/html/var/example.key.php
html/index.php
1.148 05/02/06 23:21:05 [email protected] +7 -3
load preCore
remove hardcoded var path
html/includes/xarPreCore.php
1.0 05/02/06 23:21:05 [email protected] +0 -0
BitKeeper file /home/jonn/projects/jsb/core/movablevar/html/includes/xarPreCore.php
html/includes/xarMLS.php
1.115 05/02/06 23:21:05 [email protected] +1 -1
Hey, I thought I'd fixed this in stable already?!
replacing hardcoded var path
html/includes/xarCore.php
1.162.1.1 05/02/06 23:21:05 [email protected] +19 -27
alias the xarCoreGetVarDirPath to xarPreCoreGetVarDirPath
the other diffs aren't changes... my editor is removing
trailing spaces.
html/includes/xarCache.php
1.84 05/02/06 23:21:04 [email protected] +7 -28
we won't need our copied GetVarDirPath function if
there is a pre-core way to get it.
Links for the differences:
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]
http://xaraya.com:15000/core/userlocale/[email protected]