Merge commit 17c34f1 from 'carlbennett:php-mvc'

carlbennett · carlbennett · commit f9cca0b4e3bd · 2016-07-28T04:40:47.000Z
diff --git a/src/libraries/Common.php b/src/libraries/Common.php
@@ -283,7 +283,7 @@ public static function stripUpTo($buffer, $chr, $len = 0) {
     } else if ($i === false && $len > 0) {
       return self::stripToSnippet($buffer, $len);
     } else {
-      return substr($buffer, 0, $i);
+      return self::stripToSnippet(substr($buffer, 0, $i), $len);
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ public static function stripUpTo($buffer, $chr, $len = 0) {`
`283`	`283`	`} else if ($i === false && $len > 0) {`
`284`	`284`	`return self::stripToSnippet($buffer, $len);`
`285`	`285`	`} else {`
`286`		`- return substr($buffer, 0, $i);`
	`286`	`+ return self::stripToSnippet(substr($buffer, 0, $i), $len);`
`287`	`287`	`}`
`288`	`288`	`}`
`289`	`289`