Merge pull request #1279 from cnb/master

fix generate_url bugs
GetSimpleCMS · May 21, 2018 · 3e4ea58 · 3e4ea58
2 parents 8e010c9 + 11b4e27
commit 3e4ea58
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/admin/inc/basic.php b/admin/inc/basic.php
@@ -1119,10 +1119,11 @@ function generate_url($slug, $absolute = false, $pathdata = null){
 	// not index
 	if($slug != getDef('GSINDEXSLUG')){
 		if ($PRETTYURLS == '1'){
-			$url .= generate_permalink($slug,null,$pathdata);
-		} 
-		else if (!empty($PERMALINK)){
-			$url .= generate_permalink($slug,$PERMALINK,$pathadta);
+			if (!empty($PERMALINK)){
+				$url .= generate_permalink($slug,$PERMALINK,$pathdata);
+			} else {
+				$url .= generate_permalink($slug,null,$pathdata);
+			}
 		}
 		else $url .= 'index.php?id='.$slug;
 	}