Merge branch 'master' of https://github.com/GavickPro/Image-Show

Conflicts: mod_image_show_gk4/mod_image_show_gk4.xml
GavickPro · Jan 5, 2014 · 517bce8 · 517bce8
2 parents 2bd157d + 0c0c10d
commit 517bce8
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/mod_image_show_gk4/styles/gk_appsprotech/view.php b/mod_image_show_gk4/styles/gk_appsprotech/view.php
@@ -13,7 +13,7 @@
 // no direct access
 defined('_JEXEC') or die;
 // substr function to use mb_* function if exists.
-if(function_exists('gk_substr')) {
+if(!function_exists('gk_substr')) {
 	function gk_substr($text, $start, $limit) {
 		if(function_exists('mb_substr')) {
 			return mb_substr($text, $start, $limit);	
@@ -50,7 +50,7 @@ function gk_substr($text, $start, $limit) {
 						$path = $uri->root().'modules/mod_image_show_gk4/cache/'.GKIS_AppsProTech_Image::translateName($this->config['image_show_data'][$i]->image, $this->config['module_id']);
 					} else {
 						$path = $uri->root();
-						$path .= $slide->image;
+						$path .= $this->config['image_show_data'][$i]->image;
 					}
 
 				?>

diff --git a/mod_image_show_gk4/styles/gk_bikestore/view.php b/mod_image_show_gk4/styles/gk_bikestore/view.php
@@ -32,7 +32,7 @@
 				$path = $uri->root().'modules/mod_image_show_gk4/cache/'.GKIS_Bikestore_Image::translateName($this->config['image_show_data'][$i]->image, $this->config['module_id']);
 			} else {
 				$path = $uri->root();
-				$path .= $slide->image;
+				$path .= $this->config['image_show_data'][$i]->image;
 			}
 			//
             if($this->config['image_show_data'][$i]->type == "k2") {

diff --git a/mod_image_show_gk4/styles/gk_bluap/view.php b/mod_image_show_gk4/styles/gk_bluap/view.php
@@ -31,7 +31,7 @@
 				$path = $uri->root().'modules/mod_image_show_gk4/cache/'.GKIS_Bluap_Image::translateName($this->config['image_show_data'][$i]->image, $this->config['module_id']);
 			} else {
 				$path = $uri->root();
-				$path .= $slide->image;
+				$path .= $this->config['image_show_data'][$i]->image;
 			}
             // creating slide title
 			$title = htmlspecialchars(($this->config['image_show_data'][$i]->type == "text") ? $this->config['image_show_data'][$i]->name : 'Only the text slides can be used');

diff --git a/mod_image_show_gk4/styles/gk_creativity/view.php b/mod_image_show_gk4/styles/gk_creativity/view.php
@@ -34,7 +34,7 @@
 					}
 				} else {
 					$path = $uri->root();
-					$path .= $slide->image;
+					$path .= $this->config['image_show_data'][$i]->image;
 				}   
 	            //
 	            // creating slide title

diff --git a/mod_image_show_gk4/styles/gk_fashion/view.php b/mod_image_show_gk4/styles/gk_fashion/view.php
@@ -35,7 +35,7 @@
 				$path = $uri->root().'modules/mod_image_show_gk4/cache/'.GKIS_Fashion_Image::translateName($this->config['image_show_data'][$i]->image, $this->config['module_id']);
 			} else {
 				$path = $uri->root();
-				$path .= $slide->image;
+				$path .= $this->config['image_show_data'][$i]->image;
 			}
 
             if($this->config['image_show_data'][$i]->type == "k2"){

diff --git a/mod_image_show_gk4/styles/gk_musicstate/view.php b/mod_image_show_gk4/styles/gk_musicstate/view.php
@@ -40,7 +40,7 @@
 				$path = $uri->root().'modules/mod_image_show_gk4/cache/'.GKIS_MusicState_Image::translateName($this->config['image_show_data'][$i]->image, $this->config['module_id']);
 			} else {
 				$path = $uri->root();
-				$path .= $slide->image;
+				$path .= $this->config['image_show_data'][$i]->image;
 			}
 			$content = '';
 

diff --git a/mod_image_show_gk4/styles/gk_rockwall/view.php b/mod_image_show_gk4/styles/gk_rockwall/view.php
@@ -32,7 +32,7 @@
 				$path = $uri->root().'modules/mod_image_show_gk4/cache/'.GKIS_RockWall_Image::translateName($this->config['image_show_data'][$i]->image, $this->config['module_id']);
 			} else {
 				$path = $uri->root();
-				$path .= $slide->image;
+				$path .= $this->config['image_show_data'][$i]->image;
 			}
 			$content = '';
 

diff --git a/mod_image_show_gk4/styles/gk_startup/view.php b/mod_image_show_gk4/styles/gk_startup/view.php
@@ -40,7 +40,7 @@
 						$path = $uri->root().'modules/mod_image_show_gk4/cache/'.GKIS_Startup_Image::translateName($this->config['image_show_data'][$i]->image, $this->config['module_id']);
 					} else {
 						$path = $uri->root();
-						$path .= $slide->image;
+						$path .= $this->config['image_show_data'][$i]->image;
 					}
 
 				?>

diff --git a/mod_image_show_gk4/styles/gk_storebox/view.php b/mod_image_show_gk4/styles/gk_storebox/view.php
@@ -33,7 +33,7 @@
 				$path = $uri->root().'modules/mod_image_show_gk4/cache/'.GKIS_Storebox_Image::translateName($this->config['image_show_data'][$i]->image, $this->config['module_id']);
 			} else {
 				$path = $uri->root();
-				$path .= $slide->image;
+				$path .= $this->config['image_show_data'][$i]->image;
 			}
 
 			$content = '';