Skip to content

Commit

Permalink
Merge pull request trongate#109 from toddy15/main
Browse files Browse the repository at this point in the history
Spelling fixes
  • Loading branch information
trongate authored Aug 31, 2022
2 parents 4e42e75 + b247133 commit f2b147b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Trongate is also the first PHP framework that has been built with a determinatio
<details>
<summary>Graphical Query Builder</summary>
<p>
Trongate is the only framework that comes with a free graphical SQL query builder. So, now you can build complex table joins easily and liberate yourself from costly db mangement software.
Trongate is the only framework that comes with a free graphical SQL query builder. So, now you can build complex table joins easily and liberate yourself from costly db management software.
</p>
</details>
<details>
Expand Down Expand Up @@ -130,7 +130,7 @@ Trongate is also the first PHP framework that has been built with a determinatio
<details>
<summary>Modular HAVC</summary>
<p>
Trongate uses Hierarchical Asset View Controller architecture. It's like HMVC on steroids! Finally, the PHP community have a "truely modular" PHP framework.
Trongate uses Hierarchical Asset View Controller architecture. It's like HMVC on steroids! Finally, the PHP community have a "truly modular" PHP framework.
</p>
</details>
<details>
Expand Down
2 changes: 1 addition & 1 deletion config/site_owner.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
//Settings to do with the indentify of the site owner
//Settings to do with the identification of the site owner
define('WEBSITE_NAME', '');
define('OUR_NAME', 'Your Company Name');
define('OUR_TELNUM', '');
Expand Down
10 changes: 5 additions & 5 deletions engine/get_segments.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
function get_segments($ignore_custom_routes=NULL) {

//figure out how many segments needs to be ditched
$psuedo_url = str_replace('://', '', BASE_URL);
$psuedo_url = rtrim($psuedo_url, '/');
$bits = explode('/', $psuedo_url);
//figure out how many segments need to be ditched
$pseudo_url = str_replace('://', '', BASE_URL);
$pseudo_url = rtrim($pseudo_url, '/');
$bits = explode('/', $pseudo_url);
$num_bits = count($bits);

if ($num_bits>1) {
Expand Down Expand Up @@ -43,7 +43,7 @@ function attempt_add_custom_routes($target_url) {
foreach (CUSTOM_ROUTES as $custom_route => $custom_route_destination) {
$custom_route_segments = explode('/',$custom_route);
if(count($target_segments) == count($custom_route_segments)){
if ($custom_route == $target_segments_str) { //perfect match; return immediatly
if ($custom_route == $target_segments_str) { //perfect match; return immediately
$target_url = str_replace($custom_route, $custom_route_destination, $target_url);
break;
}
Expand Down

0 comments on commit f2b147b

Please sign in to comment.