Merge pull request #3 from redmatrix/dev

Dev

1 files changed, 5 insertions, 2 deletions

diff --git a/boot.php b/boot.php
index 639d68ad6..f6b5bee1c 100755
--- a/boot.php
+++ b/boot.php
@@ -54,7 +54,7 @@ define ( 'STD_VERSION',             '3.3.3' );
 define ( 'ZOT_REVISION',            '6.0a' );
 
 
-define ( 'DB_UPDATE_VERSION',       1209 );
+define ( 'DB_UPDATE_VERSION',       1210 );
 
 define ( 'PROJECT_BASE',   __DIR__ );
 
@@ -954,7 +954,10 @@ class App {
 			&& is_array(self::$config['system'])
 			&& array_key_exists('baseurl',self::$config['system'])
 			&& strlen(self::$config['system']['baseurl'])) {
-			$url = punify(self::$config['system']['baseurl']);
+			// get_baseurl() is a heavily used function.
+			// Do not use punify() here until we find a library that performs better than what we have now.
+			//$url = punify(self::$config['system']['baseurl']);
+			$url = self::$config['system']['baseurl'];
 			$url = trim($url,'\\/');
 			return $url;
 		}