- Timestamp:
- Feb 26, 2010, 1:03:01 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 70 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property
svn:mergeinfo
set to
/branches/2.0 merged non-inheritable eligible
-
Property
svn:mergeinfo
set to
-
trunk/about.php
-
Property
svn:mergeinfo
set to
/branches/2.0/about.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/action.php
-
Property
svn:mergeinfo
set to
/branches/2.0/action.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/admin.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/category.php
-
Property
svn:mergeinfo
set to
/branches/2.0/category.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/comments.php
-
Property
svn:mergeinfo
set to
/branches/2.0/comments.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/feed.php
-
Property
svn:mergeinfo
set to
/branches/2.0/feed.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/identification.php
-
Property
svn:mergeinfo
set to
/branches/2.0/identification.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include
-
Property
svn:mergeinfo
set to
/branches/2.0/include merged non-inheritable eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/block.class.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/block.class.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/calendar_base.class.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/calendar_base.class.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/calendar_monthly.class.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/calendar_monthly.class.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/calendar_weekly.class.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/calendar_weekly.class.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/category_cats.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/category_cats.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/category_default.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/category_default.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/class_smtp_mail.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/class_smtp_mail.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/common.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/common.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/config_default.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/config_default.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/constants.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/constants.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/feedcreator.class.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/feedcreator.class.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/filter.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/filter.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/functions.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/functions.inc.php merged eligible
r4388 r4966 517 517 global $lang; 518 518 519 if (strpos($date, '0') == 0) 520 { 521 return l10n('N/A'); 522 } 523 519 524 $ymdhms = array(); 520 525 $tok = strtok( $date, '- :'); -
Property
svn:mergeinfo
set to
-
trunk/include/functions_calendar.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/functions_calendar.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/functions_category.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/functions_category.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/functions_comment.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/functions_comment.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/functions_cookie.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/functions_cookie.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/functions_filter.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/functions_filter.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/functions_html.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/functions_html.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/functions_mail.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/functions_mail.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/functions_metadata.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/functions_metadata.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/functions_notification.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/functions_notification.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/functions_picture.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/functions_picture.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/functions_plugins.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/functions_plugins.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/functions_rate.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/functions_rate.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/functions_search.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/functions_search.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/functions_session.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/functions_session.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/functions_tag.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/functions_tag.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/functions_url.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/functions_url.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/functions_user.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/functions_user.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/functions_xml.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/functions_xml.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/index.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/index.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/menubar.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/menubar.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/page_header.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/page_header.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/page_tail.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/page_tail.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/picture_comment.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/picture_comment.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/picture_metadata.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/picture_metadata.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/picture_rate.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/picture_rate.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/section_init.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/section_init.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/template.class.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/template.class.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/user.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/user.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/ws_core.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/ws_core.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/include/ws_functions.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/include/ws_functions.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/index.php
-
Property
svn:mergeinfo
set to
/branches/2.0/index.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/install.php
-
Property
svn:mergeinfo
set to
/branches/2.0/install.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/nbm.php
-
Property
svn:mergeinfo
set to
/branches/2.0/nbm.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/notification.php
-
Property
svn:mergeinfo
set to
/branches/2.0/notification.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/password.php
-
Property
svn:mergeinfo
set to
/branches/2.0/password.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/picture.php
-
Property
svn:mergeinfo
set to
/branches/2.0/picture.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/popuphelp.php
-
Property
svn:mergeinfo
set to
/branches/2.0/popuphelp.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/profile.php
-
Property
svn:mergeinfo
set to
/branches/2.0/profile.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/qsearch.php
-
Property
svn:mergeinfo
set to
/branches/2.0/qsearch.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/random.php
-
Property
svn:mergeinfo
set to
/branches/2.0/random.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/register.php
-
Property
svn:mergeinfo
set to
/branches/2.0/register.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/search.php
-
Property
svn:mergeinfo
set to
/branches/2.0/search.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/search_rules.php
-
Property
svn:mergeinfo
set to
/branches/2.0/search_rules.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/tags.php
-
Property
svn:mergeinfo
set to
/branches/2.0/tags.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/upgrade.php
-
Property
svn:mergeinfo
set to
/branches/2.0/upgrade.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/upgrade_feed.php
-
Property
svn:mergeinfo
set to
/branches/2.0/upgrade_feed.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/upload.php
-
Property
svn:mergeinfo
set to
/branches/2.0/upload.php merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/ws.php
-
Property
svn:mergeinfo
set to
/branches/2.0/ws.php merged eligible
-
Property
svn:mergeinfo
set to
Note: See TracChangeset
for help on using the changeset viewer.