X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=format.php;h=81878eb7813abaed483f084b000998c237678ad0;hb=22989a9ee35a199c5ef75ace19244761ea8c5af6;hp=28c555daedb7dae0c89ea9cfcb59ca28c8182a4a;hpb=65a85c00663b9f9a597f04f1c2705e857ba50f38;p=wfpl.git

diff --git a/format.php b/format.php
index 28c555d..81878eb 100644
--- a/format.php
+++ b/format.php
@@ -173,6 +173,7 @@ function format_slug($str) {
 function format_varname($str) {
 	$str = preg_replace("/([a-z])([A-Z])/", "\\1_\\2", $str); # split words on camelCase
 	$str = strtolower($str);
+	$str = preg_replace("/['‘’]/", '', $str);
 	$str = preg_replace('/[^a-z0-9_]+/', '_', $str);
 	return preg_replace('/^([^a-z_])/', "_\\1", $str);
 }
@@ -302,13 +303,13 @@ function format_dollars($str) {
 # date is edited as mm/dd/yyyy but stored as yyyy-mm-dd
 function format_mdy_to_ymd($str) {
 	if($str == '') return '';
-	require_once(__DIR__ . '/time.php');
+	require_once(__DIR__.'/'.'time.php');
 	return mdy_to_ymd(format_oneline($str));
 }
 
 # date is yyyy-mm-dd
 function format_ymd($str) {
-	require_once(__DIR__ . '/time.php');
+	require_once(__DIR__.'/'.'time.php');
 	list($year, $month, $day) = ymd_clean($str);
 	return sprintf('%04u-%02u-%02u', $year, $month, $day);
 }