Merge branch 'master' of https://github.com/LordBeaver/infinity-squared

Conflicts: index.php result.php
2015-03-01 20:06:24 +00:00
parent 4683e2bd3d ff9d158626
commit 26dea2e4c4
4 changed files with 21 additions and 6 deletions
--- a/header.php
+++ b/header.php
@@ -9,8 +9,7 @@ class ISQ { public static $general = array(), $links = array(), $social = array(

 // Load translations
 function isq_load_textdomain() {
-    yourls_load_custom_textdomain( 'isq_translation', $site . '/public/languages' );
-    $site = YOURLS_SITE;
+    yourls_load_custom_textdomain( 'isq_translation', '/public/languages' );
 }
 isq_load_textdomain();
 ?>