Changeset 3368
- Timestamp:
- 08/27/2008 05:27:10 PM (3 months ago)
- Location:
- trunk/system
- Files:
-
- 2 modified
- 1 moved
-
classes/router.php (modified) (1 diff)
-
classes/utf8.php (modified) (24 diffs)
-
utf8 (moved) (moved from trunk/system/core/utf8) (1 prop)
Legend:
- Unmodified
- Added
- Removed
-
trunk/system/classes/router.php
r3367 r3368 36 36 37 37 // Load routes 38 $routes = Kohana::config('rout ing');38 $routes = Kohana::config('routes'); 39 39 40 40 if (isset($routes['_default']) OR count($routes) > 1 AND isset($routes[1])) -
trunk/system/classes/utf8.php
r3366 r3368 116 116 public static function transliterate_to_ascii($str, $case = 0) 117 117 { 118 if ( ! isset(self::$called[__ FUNCTION__]))119 { 120 require SYSPATH.' core/utf8/'.__FUNCTION__.EXT;121 122 // Function has been called 123 self::$called[__ FUNCTION__] = TRUE;118 if ( ! isset(self::$called[__METHOD__])) 119 { 120 require SYSPATH.'utf8/'.__METHOD__.EXT; 121 122 // Function has been called 123 self::$called[__METHOD__] = TRUE; 124 124 } 125 125 … … 136 136 public static function strlen($str) 137 137 { 138 if ( ! isset(self::$called[__ FUNCTION__]))139 { 140 require SYSPATH.' core/utf8/'.__FUNCTION__.EXT;141 142 // Function has been called 143 self::$called[__ FUNCTION__] = TRUE;138 if ( ! isset(self::$called[__METHOD__])) 139 { 140 require SYSPATH.'utf8/'.__METHOD__.EXT; 141 142 // Function has been called 143 self::$called[__METHOD__] = TRUE; 144 144 } 145 145 … … 161 161 public static function strpos($str, $search, $offset = 0) 162 162 { 163 if ( ! isset(self::$called[__ FUNCTION__]))164 { 165 require SYSPATH.' core/utf8/'.__FUNCTION__.EXT;166 167 // Function has been called 168 self::$called[__ FUNCTION__] = TRUE;163 if ( ! isset(self::$called[__METHOD__])) 164 { 165 require SYSPATH.'utf8/'.__METHOD__.EXT; 166 167 // Function has been called 168 self::$called[__METHOD__] = TRUE; 169 169 } 170 170 … … 186 186 public static function strrpos($str, $search, $offset = 0) 187 187 { 188 if ( ! isset(self::$called[__ FUNCTION__]))189 { 190 require SYSPATH.' core/utf8/'.__FUNCTION__.EXT;191 192 // Function has been called 193 self::$called[__ FUNCTION__] = TRUE;188 if ( ! isset(self::$called[__METHOD__])) 189 { 190 require SYSPATH.'utf8/'.__METHOD__.EXT; 191 192 // Function has been called 193 self::$called[__METHOD__] = TRUE; 194 194 } 195 195 … … 210 210 public static function substr($str, $offset, $length = NULL) 211 211 { 212 if ( ! isset(self::$called[__ FUNCTION__]))213 { 214 require SYSPATH.' core/utf8/'.__FUNCTION__.EXT;215 216 // Function has been called 217 self::$called[__ FUNCTION__] = TRUE;212 if ( ! isset(self::$called[__METHOD__])) 213 { 214 require SYSPATH.'utf8/'.__METHOD__.EXT; 215 216 // Function has been called 217 self::$called[__METHOD__] = TRUE; 218 218 } 219 219 … … 234 234 public static function substr_replace($str, $replacement, $offset, $length = NULL) 235 235 { 236 if ( ! isset(self::$called[__ FUNCTION__]))237 { 238 require SYSPATH.' core/utf8/'.__FUNCTION__.EXT;239 240 // Function has been called 241 self::$called[__ FUNCTION__] = TRUE;236 if ( ! isset(self::$called[__METHOD__])) 237 { 238 require SYSPATH.'utf8/'.__METHOD__.EXT; 239 240 // Function has been called 241 self::$called[__METHOD__] = TRUE; 242 242 } 243 243 … … 256 256 public static function strtolower($str) 257 257 { 258 if ( ! isset(self::$called[__ FUNCTION__]))259 { 260 require SYSPATH.' core/utf8/'.__FUNCTION__.EXT;261 262 // Function has been called 263 self::$called[__ FUNCTION__] = TRUE;258 if ( ! isset(self::$called[__METHOD__])) 259 { 260 require SYSPATH.'utf8/'.__METHOD__.EXT; 261 262 // Function has been called 263 self::$called[__METHOD__] = TRUE; 264 264 } 265 265 … … 278 278 public static function strtoupper($str) 279 279 { 280 if ( ! isset(self::$called[__ FUNCTION__]))281 { 282 require SYSPATH.' core/utf8/'.__FUNCTION__.EXT;283 284 // Function has been called 285 self::$called[__ FUNCTION__] = TRUE;280 if ( ! isset(self::$called[__METHOD__])) 281 { 282 require SYSPATH.'utf8/'.__METHOD__.EXT; 283 284 // Function has been called 285 self::$called[__METHOD__] = TRUE; 286 286 } 287 287 … … 300 300 public static function ucfirst($str) 301 301 { 302 if ( ! isset(self::$called[__ FUNCTION__]))303 { 304 require SYSPATH.' core/utf8/'.__FUNCTION__.EXT;305 306 // Function has been called 307 self::$called[__ FUNCTION__] = TRUE;302 if ( ! isset(self::$called[__METHOD__])) 303 { 304 require SYSPATH.'utf8/'.__METHOD__.EXT; 305 306 // Function has been called 307 self::$called[__METHOD__] = TRUE; 308 308 } 309 309 … … 322 322 public static function ucwords($str) 323 323 { 324 if ( ! isset(self::$called[__ FUNCTION__]))325 { 326 require SYSPATH.' core/utf8/'.__FUNCTION__.EXT;327 328 // Function has been called 329 self::$called[__ FUNCTION__] = TRUE;324 if ( ! isset(self::$called[__METHOD__])) 325 { 326 require SYSPATH.'utf8/'.__METHOD__.EXT; 327 328 // Function has been called 329 self::$called[__METHOD__] = TRUE; 330 330 } 331 331 … … 347 347 public static function strcasecmp($str1, $str2) 348 348 { 349 if ( ! isset(self::$called[__ FUNCTION__]))350 { 351 require SYSPATH.' core/utf8/'.__FUNCTION__.EXT;352 353 // Function has been called 354 self::$called[__ FUNCTION__] = TRUE;349 if ( ! isset(self::$called[__METHOD__])) 350 { 351 require SYSPATH.'utf8/'.__METHOD__.EXT; 352 353 // Function has been called 354 self::$called[__METHOD__] = TRUE; 355 355 } 356 356 … … 375 375 public static function str_ireplace($search, $replace, $str, & $count = NULL) 376 376 { 377 if ( ! isset(self::$called[__ FUNCTION__]))378 { 379 require SYSPATH.' core/utf8/'.__FUNCTION__.EXT;380 381 // Function has been called 382 self::$called[__ FUNCTION__] = TRUE;377 if ( ! isset(self::$called[__METHOD__])) 378 { 379 require SYSPATH.'utf8/'.__METHOD__.EXT; 380 381 // Function has been called 382 self::$called[__METHOD__] = TRUE; 383 383 } 384 384 … … 400 400 public static function stristr($str, $search) 401 401 { 402 if ( ! isset(self::$called[__ FUNCTION__]))403 { 404 require SYSPATH.' core/utf8/'.__FUNCTION__.EXT;405 406 // Function has been called 407 self::$called[__ FUNCTION__] = TRUE;402 if ( ! isset(self::$called[__METHOD__])) 403 { 404 require SYSPATH.'utf8/'.__METHOD__.EXT; 405 406 // Function has been called 407 self::$called[__METHOD__] = TRUE; 408 408 } 409 409 … … 425 425 public static function strspn($str, $mask, $offset = NULL, $length = NULL) 426 426 { 427 if ( ! isset(self::$called[__ FUNCTION__]))428 { 429 require SYSPATH.' core/utf8/'.__FUNCTION__.EXT;430 431 // Function has been called 432 self::$called[__ FUNCTION__] = TRUE;427 if ( ! isset(self::$called[__METHOD__])) 428 { 429 require SYSPATH.'utf8/'.__METHOD__.EXT; 430 431 // Function has been called 432 self::$called[__METHOD__] = TRUE; 433 433 } 434 434 … … 450 450 public static function strcspn($str, $mask, $offset = NULL, $length = NULL) 451 451 { 452 if ( ! isset(self::$called[__ FUNCTION__]))453 { 454 require SYSPATH.' core/utf8/'.__FUNCTION__.EXT;455 456 // Function has been called 457 self::$called[__ FUNCTION__] = TRUE;452 if ( ! isset(self::$called[__METHOD__])) 453 { 454 require SYSPATH.'utf8/'.__METHOD__.EXT; 455 456 // Function has been called 457 self::$called[__METHOD__] = TRUE; 458 458 } 459 459 … … 475 475 public static function str_pad($str, $final_str_length, $pad_str = ' ', $pad_type = STR_PAD_RIGHT) 476 476 { 477 if ( ! isset(self::$called[__ FUNCTION__]))478 { 479 require SYSPATH.' core/utf8/'.__FUNCTION__.EXT;480 481 // Function has been called 482 self::$called[__ FUNCTION__] = TRUE;477 if ( ! isset(self::$called[__METHOD__])) 478 { 479 require SYSPATH.'utf8/'.__METHOD__.EXT; 480 481 // Function has been called 482 self::$called[__METHOD__] = TRUE; 483 483 } 484 484 … … 498 498 public static function str_split($str, $split_length = 1) 499 499 { 500 if ( ! isset(self::$called[__ FUNCTION__]))501 { 502 require SYSPATH.' core/utf8/'.__FUNCTION__.EXT;503 504 // Function has been called 505 self::$called[__ FUNCTION__] = TRUE;500 if ( ! isset(self::$called[__METHOD__])) 501 { 502 require SYSPATH.'utf8/'.__METHOD__.EXT; 503 504 // Function has been called 505 self::$called[__METHOD__] = TRUE; 506 506 } 507 507 … … 520 520 public static function strrev($str) 521 521 { 522 if ( ! isset(self::$called[__ FUNCTION__]))523 { 524 require SYSPATH.' core/utf8/'.__FUNCTION__.EXT;525 526 // Function has been called 527 self::$called[__ FUNCTION__] = TRUE;522 if ( ! isset(self::$called[__METHOD__])) 523 { 524 require SYSPATH.'utf8/'.__METHOD__.EXT; 525 526 // Function has been called 527 self::$called[__METHOD__] = TRUE; 528 528 } 529 529 … … 544 544 public static function trim($str, $charlist = NULL) 545 545 { 546 if ( ! isset(self::$called[__ FUNCTION__]))547 { 548 require SYSPATH.' core/utf8/'.__FUNCTION__.EXT;549 550 // Function has been called 551 self::$called[__ FUNCTION__] = TRUE;546 if ( ! isset(self::$called[__METHOD__])) 547 { 548 require SYSPATH.'utf8/'.__METHOD__.EXT; 549 550 // Function has been called 551 self::$called[__METHOD__] = TRUE; 552 552 } 553 553 … … 567 567 public static function ltrim($str, $charlist = NULL) 568 568 { 569 if ( ! isset(self::$called[__ FUNCTION__]))570 { 571 require SYSPATH.' core/utf8/'.__FUNCTION__.EXT;572 573 // Function has been called 574 self::$called[__ FUNCTION__] = TRUE;569 if ( ! isset(self::$called[__METHOD__])) 570 { 571 require SYSPATH.'utf8/'.__METHOD__.EXT; 572 573 // Function has been called 574 self::$called[__METHOD__] = TRUE; 575 575 } 576 576 … … 590 590 public static function rtrim($str, $charlist = NULL) 591 591 { 592 if ( ! isset(self::$called[__ FUNCTION__]))593 { 594 require SYSPATH.' core/utf8/'.__FUNCTION__.EXT;595 596 // Function has been called 597 self::$called[__ FUNCTION__] = TRUE;592 if ( ! isset(self::$called[__METHOD__])) 593 { 594 require SYSPATH.'utf8/'.__METHOD__.EXT; 595 596 // Function has been called 597 self::$called[__METHOD__] = TRUE; 598 598 } 599 599 … … 612 612 public static function ord($chr) 613 613 { 614 if ( ! isset(self::$called[__ FUNCTION__]))615 { 616 require SYSPATH.' core/utf8/'.__FUNCTION__.EXT;617 618 // Function has been called 619 self::$called[__ FUNCTION__] = TRUE;614 if ( ! isset(self::$called[__METHOD__])) 615 { 616 require SYSPATH.'utf8/'.__METHOD__.EXT; 617 618 // Function has been called 619 self::$called[__METHOD__] = TRUE; 620 620 } 621 621 … … 640 640 public static function to_unicode($str) 641 641 { 642 if ( ! isset(self::$called[__ FUNCTION__]))643 { 644 require SYSPATH.' core/utf8/'.__FUNCTION__.EXT;645 646 // Function has been called 647 self::$called[__ FUNCTION__] = TRUE;642 if ( ! isset(self::$called[__METHOD__])) 643 { 644 require SYSPATH.'utf8/'.__METHOD__.EXT; 645 646 // Function has been called 647 self::$called[__METHOD__] = TRUE; 648 648 } 649 649 … … 668 668 public static function from_unicode($arr) 669 669 { 670 if ( ! isset(self::$called[__ FUNCTION__]))671 { 672 require SYSPATH.' core/utf8/'.__FUNCTION__.EXT;673 674 // Function has been called 675 self::$called[__ FUNCTION__] = TRUE;670 if ( ! isset(self::$called[__METHOD__])) 671 { 672 require SYSPATH.'utf8/'.__METHOD__.EXT; 673 674 // Function has been called 675 self::$called[__METHOD__] = TRUE; 676 676 } 677 677 -
trunk/system/utf8
