Merge branch 'master' of github.com:themosis/framework

themosis · Sep 14, 2015 · da925dc · da925dc
2 parents a3109e9 + d6df08e
commit da925dc
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 9 deletions.
diff --git a/src/Themosis/Helpers/helpers.php b/src/Themosis/Helpers/helpers.php
@@ -96,7 +96,7 @@ function tp($value)
      */
     function themosis_assets()
     {
-        return get_template_directory_uri().'/app/assets';
+        return get_template_directory_uri().'/resources/assets';
     }
 }
 

diff --git a/src/Themosis/Metabox/Meta.php b/src/Themosis/Metabox/Meta.php
@@ -66,7 +66,7 @@ private static function parse($default)
 
 		} else {
 
-			if (0 === strpos($value, 'http')) {
+			if (0 === strpos($value, 'http') && 0 !== strpos($value, 'https')) {
 
 				if (static::isFromDomain($value)) {
 

diff --git a/src/Themosis/Page/Option.php b/src/Themosis/Page/Option.php
@@ -12,19 +12,21 @@ class Option
      * @throws OptionException
      * @return mixed The option value.
      */
-    public static function get($optionGroup, $name)
+    public static function get($optionGroup, $name = null)
     {
         $option = get_option($optionGroup);
 
         if (!empty($option))
         {
-            if (isset($option[$name]))
+            if (!is_null($name))
             {
                 return $option[$name];
             }
+
+            return $option;
         }
 
         return '';
 
     }
-}
+}
diff --git a/src/Themosis/View/Loop.php b/src/Themosis/View/Loop.php
@@ -23,6 +23,16 @@ public function title()
 		return get_the_title();
 	}
 
+	/**
+	* Get the author of the current post.
+	*
+	* @return string The author of the current post.
+	*/
+	public function author()
+	{
+		return get_the_author();
+	}
+
 	/**
 	 * Get the content of the current post.
 	 *

diff --git a/src/Themosis/_assets/js/_themosis-core.js b/src/Themosis/_assets/js/_themosis-core.js
@@ -1286,7 +1286,7 @@
          */
         renameId: function(currentId, index)
         {
-            var regex = new RegExp('-([0-9])-');
+            var regex = new RegExp('-([0-9]+)-');
 
             return currentId.replace(regex, '-' + index + '-');
         },
@@ -1300,7 +1300,7 @@
          */
         renameName: function(currentName, index)
         {
-            var regex = new RegExp("([0-9])\]");
+            var regex = new RegExp("([0-9]+)\]");
 
             return currentName.replace(regex, index + ']');
         },
@@ -1314,7 +1314,7 @@
          */
         renameCollectionField: function(field, index)
         {
-            var regex = new RegExp("([0-9])\]"),
+            var regex = new RegExp("([0-9]+)\]"),
                 name = field.data('name'),
                 template = field.find('script#themosis-collection-item-template'),
                 templateContent = template.html();
@@ -1416,4 +1416,4 @@
     });
 
 
-})(jQuery);
+})(jQuery);