Changeset trunk,183
- Timestamp:
- 02/12/10 17:58:47 (6 months ago)
- revision id:
- csa@dside.dyndns.org-20100212175847-011ijrhjalukrack
- branch-nick:
- adei
- Files:
-
- trunk/includes/dhtmlx/skins/dhtmlxmenu_standard.css.diff (added)
- trunk/includes/dhtmlx/skins/dhtmlxmenu_standard.css.orig (added)
- trunk/services/info.php (added)
- trunk/classes/cache/cachedb.php (modified) (4 diffs)
- trunk/classes/request.php (modified) (2 diffs)
- trunk/config.actual.php (modified) (1 diff)
- trunk/release (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/classes/cache/cachedb.php
r157 r183 126 126 } else { 127 127 if ($postfix) { 128 throw new ADEIException(translate("Unsupported postfix is specified: %s", $string));128 throw new ADEIException(translate("Unsupported postfix (%s) is supplied", $postfix)); 129 129 } else { 130 130 throw new ADEIException(translate("Postfix should be specified")); … … 193 193 $supported = $info['supported']; 194 194 195 196 195 if ($flags&CACHE::NEED_REQUESTS) { 197 196 if ($supported) { … … 238 237 } 239 238 240 if (($flags&CACHEDB::TABLE_INFO)&&($supported)) { 241 $info['info'] = $this->GetCacheInfo($postfix); 239 if (($flags&CACHEDB::TABLE_INFO)&&($supported)&&($cache_info=$this->GetCacheInfo($postfix))) { 240 $info['info'] = $cache_info; 241 242 242 if (is_array($postfix_or_row)) { 243 243 $info['info']['records'] = $postfix_or_row[4]; … … 276 276 } else { 277 277 $info['info']['tables'] = array( 278 0 => &$info['info']278 0 => $info['info'] 279 279 ); 280 280 } trunk/classes/request.php
r175 r183 120 120 const ENCODING_JSON = 2; 121 121 const ENCODING_LABVIEW = 3; 122 const ENCODING_TEXT = 4; 122 123 123 124 function __construct(&$props = NULL) { … … 157 158 case "json": 158 159 return BASICRequest::ENCODING_JSON; 160 case "text": 161 return BASICRequest::ENCODING_TEXT; 159 162 default: 160 163 if ($default === false) trunk/config.actual.php
r178 r183 9 9 ); 10 10 11 $ADEI_SETUP = "test";12 //$ADEI_SETUP = "all";11 // $ADEI_SETUP = "test"; 12 $ADEI_SETUP = "all"; 13 13 $DEFAULT_MODULE = "wiki"; 14 14 trunk/release
r178 r183 43 43 make -C apps/csv2root clean 44 44 make -C apps/mod_root2 clean 45 46 rm -rf *.diff 47 45 48 rm -rf tmp/* 46 49 rm -rf test/tmp/*