Markup

qstudio · Jul 22, 2020 · c3926d2 · c3926d2
1 parent 9be7912
commit c3926d2
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/library/buffer/map.php b/library/buffer/map.php
@@ -116,8 +116,6 @@ public static function prepare() {
 
 			}
 
-			// PROBLEM - some tags change, for example when they have returned a value or had a flag removed, but they open and close the same... so we need to find by that.. but then we are in trouble again in case of not having unique return values for re-used tags???
-
 			// check if we have string, so we can warm if not ##
 			if( 
 				strpos( $string, $value['tag'] ) === false
@@ -138,6 +136,7 @@ public static function prepare() {
 
 		// $string = str_replace( ' ', '&nbsp;', $string );
 		// $string = nl2br( htmlentities( $string, ENT_QUOTES, 'UTF-8' ) );
+		/*
 		$return = '';
 		$lines = explode( "\n", $string );
 		// h::log( $lines ); 
@@ -149,9 +148,10 @@ public static function prepare() {
 		$return = nl2br( $return );
 
 		// h::log( $return );
+		*/
 
 		// kick back ##
-		return $return;
+		return $string;
 
 	}
 

diff --git a/library/context/_load.php b/library/context/_load.php
@@ -330,7 +330,7 @@ class_exists( $namespace ) // && exists ##
 				|| ! is_array( $return_array )
 			){
 
-				h::log( 'e:>Error in returned data from "'.$args['context'].'::'.$args['task'].'"' );
+				// h::log( 'e:>Error in returned data from "'.$args['context'].'::'.$args['task'].'"' );
 				// h::log( $return_array );
 
 				// ...

diff --git a/library/context/ui.php b/library/context/ui.php
@@ -105,7 +105,7 @@ public static function header( $args = null )
 			// h::log( 'Running from method' );
 
 			// we can call the footer::render() method
-			return theme\view\ui\header::render( $args );
+			return theme\view\ui\header::header( $args );
 
 		}
 

diff --git a/library/parse/_load.php b/library/parse/_load.php
@@ -132,7 +132,7 @@ functions::prepare( $args, $process );
 		// goes last, as other tags might have added new variables to prepare ##
 		variables::prepare( $args, $process );
 
-		h::log( 't:>THIS breaks many things, but is needed for filters to run and replace correctly.. TODO' );
+		// h::log( 't:>THIS breaks many things, but is needed for filters to run and replace correctly.. TODO' );
 		// remove all flags before markup is parsed ##
 		// flags::cleanup( $args, $process );
 

diff --git a/library/parse/markup.php b/library/parse/markup.php
@@ -58,7 +58,7 @@ public static function get( string $string = null, $type = 'variable' ) {
 			// log ##
 			// h::log( 't:>TOOD - if no self::$args - set to buffer' );
 			// h::log( self::$args['task'].'~>n:>No variables found in string.' );
-			h::log( 'd:>No variables found in string.' );
+			// h::log( 'd:>No variables found in string.' );
 			// h::log( '$string: "'.$string.'"' );
 
             return false;

diff --git a/library/render/markup.php b/library/render/markup.php
@@ -413,7 +413,7 @@ public static function string( $args = null ){
 		// h::log( 't:>## -- BOOM -- this breaks other flags for buffer search replace ####' );
 		// $string = preg_replace( $flag_regex, '', $string );
 
-		h::log( 'd:>$string: '.$string );
+		// h::log( 'd:>$string: '.$string );
 
 		// filter variable ##
 		$value = apply_filters( 'q/willow/render/markup/variable', $value, $key );
@@ -429,7 +429,7 @@ public static function string( $args = null ){
 		$regex = \apply_filters( 'q/render/markup/string', "~\\$open(?:\s*\[[^][{}]*])?\s*$key\s*\\$close~" ); 
 		// $regex = "~\\$open(?:\s*\[[^][{}]*])?\s*$key\s*\\$close~";
 		// 
-		h::log( $regex );
+		// h::log( $regex );
 		// h::log( $flag_regex );
 		$string = preg_replace( $regex, $value, $string );